Changeset 8f5afcf

Timestamp:

Jul 13, 2011, 11:51:37 PM (13 years ago)

Author:

GitHub Merge Button <merge-button@github.com>

Parents:

30d0cf7 (diff), a7b125d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge a7b125d60dcd2a22d2dfb2634982352acdcbc51c into 30d0cf75d34271caa5cca99bfac799fb7aaed6d7

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)
• aim.c (modified) (1 diff)
• variable.c (modified) (1 diff)

functions.c

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

global.c

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

logging.c

@@ -224 +224 @@
     while (cc != NULL) {
       temp = short_zuser(cc->data);
-      filename = g_strdup_printf("%s/%s", logpath, temp);
+      filename = g_build_filename(logpath, temp, NULL);
       owl_log_append(m, filename);
 
@@ -248 +248 @@
   }
 
-  filename = g_strdup_printf("%s/%s", logpath, to);
+  filename = g_build_filename(logpath, to, NULL);
   owl_log_append(m, filename);
   g_free(to);
   g_free(filename);
 
-  filename = g_strdup_printf("%s/all", logpath);
+  filename = g_build_filename(logpath, "all", NULL);
   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_strdup_printf("%s/%s", logpath, tobuff);
+  filename = g_build_filename(logpath, tobuff, NULL);
   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_strdup_printf("%s/all", logpath);
+  filename = g_build_filename(logpath, "all", NULL);
   g_free(logpath);
   msgbuf = g_string_new("");
@@ -393 +393 @@
   if (personal) {
     logpath = owl_util_makepath(owl_global_get_logpath(&g));
-    filename = g_strdup_printf("%s/%s", logpath, from);
-    allfilename = g_strdup_printf("%s/all", logpath);
+    filename = g_build_filename(logpath, from, NULL);
+    allfilename = g_build_filename(logpath, "all", NULL);
     owl_log_append(m, allfilename);
     g_free(allfilename);
   } else {
     logpath = owl_util_makepath(owl_global_get_classlogpath(&g));
-    filename = g_strdup_printf("%s/%s", logpath, from);
+    filename = g_build_filename(logpath, from, NULL);
   }
 
@@ -415 +415 @@
       temp = short_zuser(cc->data);
       if (strcasecmp(temp, frombuff) != 0) {
-        filename = g_strdup_printf("%s/%s", logpath, temp);
+        filename = g_build_filename(logpath, temp, NULL);
         owl_log_append(m, filename);
         g_free(filename);

message.c

@@ -884 +884 @@
     char *zcrypt;
 
-    zcrypt = g_strdup_printf("%s/zcrypt", owl_get_bindir());
+    zcrypt = g_build_filename(owl_get_bindir(), "zcrypt", NULL);
 
     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_strdup_printf("%s/lib", owl_get_datadir());
+  path = g_build_filename(owl_get_datadir(), "lib", NULL);
   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_path(G_DIR_SEPARATOR_S,
-                               last_dir,
-                               link_path,
-                               NULL);
+      char *tmp = g_build_filename(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];
@@ -433 +434 @@
 
   /* Open~/.crypt-table */
-  filename = g_strdup_printf("%s/.crypt-table", getenv("HOME"));
+  home = getenv("HOME");
+  if (home == NULL)
+    home = g_get_home_dir();
+  filename = g_build_filename(home, ".crypt-table", NULL);
   fsearch = fopen(filename, "r");
   if (fsearch)

zephyr.c

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

aim.c

@@ -1812 +1812 @@
   GPollFD *fd;
   int i;
-  if (len < event_source->fds->len)
+  if (len < event_source->fds->len) {
     owl_function_debugmsg("Truncating AIM PollFDs to %d, was %d", len, event_source->fds->len);
-  for (i = len; i < event_source->fds->len; i++) {
-    fd = event_source->fds->pdata[i];
-    g_source_remove_poll(&event_source->source, fd);
-    g_free(fd);
-  }
-  g_ptr_array_remove_range(event_source->fds, len, event_source->fds->len - len);
+    for (i = len; i < event_source->fds->len; i++) {
+      fd = event_source->fds->pdata[i];
+      g_source_remove_poll(&event_source->source, fd);
+      g_free(fd);
+    }
+    g_ptr_array_remove_range(event_source->fds, len, event_source->fds->len - len);
+  }
 }
 

variable.c

@@ -161 +161 @@
                "Enable logging of login notifications",
                "When this is enabled, BarnOwl will log login and logout notifications\n"
-               "for AIM, zephyr, or other protocols.  If disabled Owl will not print\n"
+               "for AIM, zephyr, or other protocols.  If disabled BarnOwl will not print\n"
                "login or logout notifications.\n"),