trustbridge: cinst/mozilla.c comparison

Refactoring.

author	Sascha Wilde <wilde@intevation.de>
date	Fri, 28 Mar 2014 10:45:55 +0100
parents	92b1e5ed2d5f
children	774e944c395b

comparison

equal deleted inserted replaced

-:92b1e5ed2d5f
+:c342b93c5bd1
 }
 return inis;
 }
 /**
+* @brief Collect all mozilla profile directories of current user.
+* @return NULL terminated array of strings containing the absolute
+* path of the profile directories.  The array needs to be freed by the
+* caller.
+*/
+static char**
+get_all_profile_dirs()
+{
+char **mozinis, **pdirs;
+char **alldirs = NULL;
+if ((mozinis = get_profile_inis()) != NULL)
+{
+for (int i=0; mozinis[i] != NULL; i++)
+{
+pdirs =
+get_profile_dirs(mozinis[i]);
+if (pdirs != NULL)
+{
+for (int i=0; pdirs[i] != NULL; i++)
+{
+strv_append(&alldirs, pdirs[i], strlen(pdirs[i]));
+}
+strv_free(pdirs);
+}
+}
+strv_free(mozinis);
+}
+return alldirs;
+}
+/**
 * @brief list certificates from nss certificate store
 * @param[in] confdir the directory with the certificate store
 */
 static void
 nss_list_certs (char *confdir)
 int
 main ()
 {
-int y = 0;
+char **pdirs;
-char **mozinis, **pdirs;
+pdirs =
-if ((mozinis = get_profile_inis()) != NULL)
+get_all_profile_dirs();
-while (mozinis[y] != NULL)
+if (pdirs != NULL)
 {
-pdirs =
+for (int i=0; pdirs[i] != NULL; i++)
-get_profile_dirs(mozinis[y++]);
+{
-if (pdirs != NULL)
+puts(pdirs[i]);
-{
+nss_list_certs(pdirs[i]);
-for (int x=0; pdirs[x] != NULL; x++)
+}
-{
+strv_free(pdirs);
-puts(pdirs[x]);
+}
-nss_list_certs(pdirs[x]);
-}
-strv_free(pdirs);
-}
-}
 exit(return_code);
 }

Mercurial > trustbridge