Changeset 06af663
- Timestamp:
- Jul 12, 2011, 12:26:19 PM (13 years ago)
- Children:
- a7b125d
- Parents:
- 16cf182d
- git-author:
- David Benjamin <davidben@mit.edu> (07/12/11 11:58:02)
- git-committer:
- David Benjamin <davidben@mit.edu> (07/12/11 12:26:19)
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
functions.c
refeec7f r06af663 410 410 old_msg = g_strdup(owl_zwrite_get_message(z)); 411 411 412 zcrypt = g_ strdup_printf("%s/zcrypt", owl_get_bindir());412 zcrypt = g_build_filename(owl_get_bindir(), "zcrypt", NULL); 413 413 argv[0] = "zcrypt"; 414 414 argv[1] = "-E"; -
global.c
r16cf182d r06af663 77 77 g->confdir = NULL; 78 78 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); 80 80 owl_global_set_confdir(g, cd); 81 81 g_free(cd); … … 364 364 g->confdir = g_strdup(cd); 365 365 g_free(g->startupfile); 366 g->startupfile = g_ strdup_printf("%s/startup", cd);366 g->startupfile = g_build_filename(cd, "startup", NULL); 367 367 } 368 368 -
logging.c
r6829afc r06af663 224 224 while (cc != NULL) { 225 225 temp = short_zuser(cc->data); 226 filename = g_ strdup_printf("%s/%s", logpath, temp);226 filename = g_build_filename(logpath, temp, NULL); 227 227 owl_log_append(m, filename); 228 228 … … 248 248 } 249 249 250 filename = g_ strdup_printf("%s/%s", logpath, to);250 filename = g_build_filename(logpath, to, NULL); 251 251 owl_log_append(m, filename); 252 252 g_free(to); 253 253 g_free(filename); 254 254 255 filename = g_ strdup_printf("%s/all", logpath);255 filename = g_build_filename(logpath, "all", NULL); 256 256 owl_log_append(m, filename); 257 257 g_free(logpath); … … 285 285 /* expand ~ in path names */ 286 286 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); 288 288 msgbuf = g_string_new(""); 289 289 g_string_printf(msgbuf, "ERROR (owl): %s\n%s\n", tobuff, text); … … 294 294 g_string_free(msgbuf, TRUE); 295 295 296 filename = g_ strdup_printf("%s/all", logpath);296 filename = g_build_filename(logpath, "all", NULL); 297 297 g_free(logpath); 298 298 msgbuf = g_string_new(""); … … 393 393 if (personal) { 394 394 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); 397 397 owl_log_append(m, allfilename); 398 398 g_free(allfilename); 399 399 } else { 400 400 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); 402 402 } 403 403 … … 415 415 temp = short_zuser(cc->data); 416 416 if (strcasecmp(temp, frombuff) != 0) { 417 filename = g_ strdup_printf("%s/%s", logpath, temp);417 filename = g_build_filename(logpath, temp, NULL); 418 418 owl_log_append(m, filename); 419 419 g_free(filename); -
message.c
rf9df2f0 r06af663 884 884 char *zcrypt; 885 885 886 zcrypt = g_ strdup_printf("%s/zcrypt", owl_get_bindir());886 zcrypt = g_build_filename(owl_get_bindir(), "zcrypt", NULL); 887 887 888 888 rv = call_filter(zcrypt, argv, owl_message_get_body(m), &out, &status); -
perlconfig.c
rce68f23 r06af663 406 406 /* Add the system lib path to @INC */ 407 407 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); 409 409 av_unshift(inc, 1); 410 410 av_store(inc, 0, owl_new_sv(path)); -
util.c
rc0c48d14 r06af663 388 388 if (!g_path_is_absolute(link_path)) { 389 389 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); 394 391 g_free(last_dir); 395 392 g_free(link_path); -
zcrypt.c
r6829afc r06af663 433 433 434 434 /* Open~/.crypt-table */ 435 filename = g_ strdup_printf("%s/.crypt-table", getenv("HOME"));435 filename = g_build_filename(home, ".crypt-table", NULL); 436 436 fsearch = fopen(filename, "r"); 437 437 if (fsearch) -
zephyr.c
recffae6 r06af663 38 38 return g_strdup(input); 39 39 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); 41 41 } 42 42
Note: See TracChangeset
for help on using the changeset viewer.