Changeset 8f5afcf


Ignore:
Timestamp:
Jul 13, 2011, 11:51:37 PM (10 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:
10 edited

Legend:

Unmodified
Added
Removed
  • functions.c

    refeec7f r06af663  
    410410  old_msg = g_strdup(owl_zwrite_get_message(z));
    411411
    412   zcrypt = g_strdup_printf("%s/zcrypt", owl_get_bindir());
     412  zcrypt = g_build_filename(owl_get_bindir(), "zcrypt", NULL);
    413413  argv[0] = "zcrypt";
    414414  argv[1] = "-E";
  • global.c

    r16cf182d r06af663  
    7777  g->confdir = NULL;
    7878  g->startupfile = NULL;
    79   cd = g_strdup_printf("%s/%s", g->homedir, OWL_CONFIG_DIR);
     79  cd = g_build_filename(g->homedir, OWL_CONFIG_DIR, NULL);
    8080  owl_global_set_confdir(g, cd);
    8181  g_free(cd);
     
    364364  g->confdir = g_strdup(cd);
    365365  g_free(g->startupfile);
    366   g->startupfile = g_strdup_printf("%s/startup", cd);
     366  g->startupfile = g_build_filename(cd, "startup", NULL);
    367367}
    368368
  • logging.c

    r6829afc r06af663  
    224224    while (cc != NULL) {
    225225      temp = short_zuser(cc->data);
    226       filename = g_strdup_printf("%s/%s", logpath, temp);
     226      filename = g_build_filename(logpath, temp, NULL);
    227227      owl_log_append(m, filename);
    228228
     
    248248  }
    249249
    250   filename = g_strdup_printf("%s/%s", logpath, to);
     250  filename = g_build_filename(logpath, to, NULL);
    251251  owl_log_append(m, filename);
    252252  g_free(to);
    253253  g_free(filename);
    254254
    255   filename = g_strdup_printf("%s/all", logpath);
     255  filename = g_build_filename(logpath, "all", NULL);
    256256  owl_log_append(m, filename);
    257257  g_free(logpath);
     
    285285  /* expand ~ in path names */
    286286  logpath = owl_util_makepath(owl_global_get_logpath(&g));
    287   filename = g_strdup_printf("%s/%s", logpath, tobuff);
     287  filename = g_build_filename(logpath, tobuff, NULL);
    288288  msgbuf = g_string_new("");
    289289  g_string_printf(msgbuf, "ERROR (owl): %s\n%s\n", tobuff, text);
     
    294294  g_string_free(msgbuf, TRUE);
    295295
    296   filename = g_strdup_printf("%s/all", logpath);
     296  filename = g_build_filename(logpath, "all", NULL);
    297297  g_free(logpath);
    298298  msgbuf = g_string_new("");
     
    393393  if (personal) {
    394394    logpath = owl_util_makepath(owl_global_get_logpath(&g));
    395     filename = g_strdup_printf("%s/%s", logpath, from);
    396     allfilename = g_strdup_printf("%s/all", logpath);
     395    filename = g_build_filename(logpath, from, NULL);
     396    allfilename = g_build_filename(logpath, "all", NULL);
    397397    owl_log_append(m, allfilename);
    398398    g_free(allfilename);
    399399  } else {
    400400    logpath = owl_util_makepath(owl_global_get_classlogpath(&g));
    401     filename = g_strdup_printf("%s/%s", logpath, from);
     401    filename = g_build_filename(logpath, from, NULL);
    402402  }
    403403
     
    415415      temp = short_zuser(cc->data);
    416416      if (strcasecmp(temp, frombuff) != 0) {
    417         filename = g_strdup_printf("%s/%s", logpath, temp);
     417        filename = g_build_filename(logpath, temp, NULL);
    418418        owl_log_append(m, filename);
    419419        g_free(filename);
  • message.c

    rf9df2f0 r06af663  
    884884    char *zcrypt;
    885885
    886     zcrypt = g_strdup_printf("%s/zcrypt", owl_get_bindir());
     886    zcrypt = g_build_filename(owl_get_bindir(), "zcrypt", NULL);
    887887
    888888    rv = call_filter(zcrypt, argv, owl_message_get_body(m), &out, &status);
  • perlconfig.c

    rce68f23 r06af663  
    406406  /* Add the system lib path to @INC */
    407407  inc = get_av("INC", 0);
    408   path = g_strdup_printf("%s/lib", owl_get_datadir());
     408  path = g_build_filename(owl_get_datadir(), "lib", NULL);
    409409  av_unshift(inc, 1);
    410410  av_store(inc, 0, owl_new_sv(path));
  • util.c

    rc0c48d14 r06af663  
    388388    if (!g_path_is_absolute(link_path)) {
    389389      char *last_dir = g_path_get_dirname(last_path);
    390       char *tmp = g_build_path(G_DIR_SEPARATOR_S,
    391                                last_dir,
    392                                link_path,
    393                                NULL);
     390      char *tmp = g_build_filename(last_dir, link_path, NULL);
    394391      g_free(last_dir);
    395392      g_free(link_path);
  • zcrypt.c

    r6829afc ra7b125d  
    411411  int length[MAX_SEARCH], i;
    412412  char buffer[MAX_BUFF];
     413  const char *home;
    413414  char *filename;
    414415  char result[MAX_SEARCH][MAX_BUFF];
     
    433434
    434435  /* Open~/.crypt-table */
    435   filename = g_strdup_printf("%s/.crypt-table", getenv("HOME"));
     436  home = getenv("HOME");
     437  if (home == NULL)
     438    home = g_get_home_dir();
     439  filename = g_build_filename(home, ".crypt-table", NULL);
    436440  fsearch = fopen(filename, "r");
    437441  if (fsearch)
  • zephyr.c

    recffae6 r06af663  
    3838    return g_strdup(input);
    3939  else
    40     return g_strdup_printf("%s/%s", owl_global_get_homedir(&g), name);
     40    return g_build_filename(owl_global_get_homedir(&g), name, NULL);
    4141}
    4242
  • aim.c

    re4524da r24b2f18  
    18121812  GPollFD *fd;
    18131813  int i;
    1814   if (len < event_source->fds->len)
     1814  if (len < event_source->fds->len) {
    18151815    owl_function_debugmsg("Truncating AIM PollFDs to %d, was %d", len, event_source->fds->len);
    1816   for (i = len; i < event_source->fds->len; i++) {
    1817     fd = event_source->fds->pdata[i];
    1818     g_source_remove_poll(&event_source->source, fd);
    1819     g_free(fd);
    1820   }
    1821   g_ptr_array_remove_range(event_source->fds, len, event_source->fds->len - len);
     1816    for (i = len; i < event_source->fds->len; i++) {
     1817      fd = event_source->fds->pdata[i];
     1818      g_source_remove_poll(&event_source->source, fd);
     1819      g_free(fd);
     1820    }
     1821    g_ptr_array_remove_range(event_source->fds, len, event_source->fds->len - len);
     1822  }
    18221823}
    18231824
  • variable.c

    ra16d7e5 r30d0cf7  
    161161               "Enable logging of login notifications",
    162162               "When this is enabled, BarnOwl will log login and logout notifications\n"
    163                "for AIM, zephyr, or other protocols.  If disabled Owl will not print\n"
     163               "for AIM, zephyr, or other protocols.  If disabled BarnOwl will not print\n"
    164164               "login or logout notifications.\n"),
    165165
Note: See TracChangeset for help on using the changeset viewer.