Changes in / [8f5afcf:30d0cf7]

Files:

• functions.c (modified) (1 diff)
• global.c (modified) (2 diffs)
• logging.c (modified) (6 diffs)
• message.c (modified) (1 diff)
• perlconfig.c (modified) (1 diff)
• util.c (modified) (1 diff)
• zcrypt.c (modified) (2 diffs)
• zephyr.c (modified) (1 diff)

functions.c

@@ -410 +410 @@
   old_msg = g_strdup(owl_zwrite_get_message(z));
 
-  zcrypt = g_build_filename(owl_get_bindir(), "zcrypt", NULL);
+  zcrypt = g_strdup_printf("%s/zcrypt", owl_get_bindir());
   argv[0] = "zcrypt";
   argv[1] = "-E";

global.c

@@ -77 +77 @@
   g->confdir = NULL;
   g->startupfile = NULL;
-  cd = g_build_filename(g->homedir, OWL_CONFIG_DIR, NULL);
+  cd = g_strdup_printf("%s/%s", g->homedir, OWL_CONFIG_DIR);
   owl_global_set_confdir(g, cd);
   g_free(cd);
@@ -364 +364 @@
   g->confdir = g_strdup(cd);
   g_free(g->startupfile);
-  g->startupfile = g_build_filename(cd, "startup", NULL);
+  g->startupfile = g_strdup_printf("%s/startup", cd);
 }
 

logging.c

@@ -224 +224 @@
     while (cc != NULL) {
       temp = short_zuser(cc->data);
-      filename = g_build_filename(logpath, temp, NULL);
+      filename = g_strdup_printf("%s/%s", logpath, temp);
       owl_log_append(m, filename);
 
@@ -248 +248 @@
   }
 
-  filename = g_build_filename(logpath, to, NULL);
+  filename = g_strdup_printf("%s/%s", logpath, to);
   owl_log_append(m, filename);
   g_free(to);
   g_free(filename);
 
-  filename = g_build_filename(logpath, "all", NULL);
+  filename = g_strdup_printf("%s/all", logpath);
   owl_log_append(m, filename);
   g_free(logpath);
@@ -285 +285 @@
   /* expand ~ in path names */
   logpath = owl_util_makepath(owl_global_get_logpath(&g));
-  filename = g_build_filename(logpath, tobuff, NULL);
+  filename = g_strdup_printf("%s/%s", logpath, tobuff);
   msgbuf = g_string_new("");
   g_string_printf(msgbuf, "ERROR (owl): %s\n%s\n", tobuff, text);
@@ -294 +294 @@
   g_string_free(msgbuf, TRUE);
 
-  filename = g_build_filename(logpath, "all", NULL);
+  filename = g_strdup_printf("%s/all", logpath);
   g_free(logpath);
   msgbuf = g_string_new("");
@@ -393 +393 @@
   if (personal) {
     logpath = owl_util_makepath(owl_global_get_logpath(&g));
-    filename = g_build_filename(logpath, from, NULL);
-    allfilename = g_build_filename(logpath, "all", NULL);
+    filename = g_strdup_printf("%s/%s", logpath, from);
+    allfilename = g_strdup_printf("%s/all", logpath);
     owl_log_append(m, allfilename);
     g_free(allfilename);
   } else {
     logpath = owl_util_makepath(owl_global_get_classlogpath(&g));
-    filename = g_build_filename(logpath, from, NULL);
+    filename = g_strdup_printf("%s/%s", logpath, from);
   }
 
@@ -415 +415 @@
       temp = short_zuser(cc->data);
       if (strcasecmp(temp, frombuff) != 0) {
-        filename = g_build_filename(logpath, temp, NULL);
+        filename = g_strdup_printf("%s/%s", logpath, temp);
         owl_log_append(m, filename);
         g_free(filename);

message.c

@@ -884 +884 @@
     char *zcrypt;
 
-    zcrypt = g_build_filename(owl_get_bindir(), "zcrypt", NULL);
+    zcrypt = g_strdup_printf("%s/zcrypt", owl_get_bindir());
 
     rv = call_filter(zcrypt, argv, owl_message_get_body(m), &out, &status);

perlconfig.c

@@ -406 +406 @@
   /* Add the system lib path to @INC */
   inc = get_av("INC", 0);
-  path = g_build_filename(owl_get_datadir(), "lib", NULL);
+  path = g_strdup_printf("%s/lib", owl_get_datadir());
   av_unshift(inc, 1);
   av_store(inc, 0, owl_new_sv(path));

util.c

@@ -388 +388 @@
     if (!g_path_is_absolute(link_path)) {
       char *last_dir = g_path_get_dirname(last_path);
-      char *tmp = g_build_filename(last_dir, link_path, NULL);
+      char *tmp = g_build_path(G_DIR_SEPARATOR_S,
+                               last_dir,
+                               link_path,
+                               NULL);
       g_free(last_dir);
       g_free(link_path);

zcrypt.c

@@ -411 +411 @@
   int length[MAX_SEARCH], i;
   char buffer[MAX_BUFF];
-  const char *home;
   char *filename;
   char result[MAX_SEARCH][MAX_BUFF];
@@ -434 +433 @@
 
   /* Open~/.crypt-table */
-  home = getenv("HOME");
-  if (home == NULL)
-    home = g_get_home_dir();
-  filename = g_build_filename(home, ".crypt-table", NULL);
+  filename = g_strdup_printf("%s/.crypt-table", getenv("HOME"));
   fsearch = fopen(filename, "r");
   if (fsearch)

zephyr.c

@@ -38 +38 @@
     return g_strdup(input);
   else
-    return g_build_filename(owl_global_get_homedir(&g), name, NULL);
+    return g_strdup_printf("%s/%s", owl_global_get_homedir(&g), name);
 }