diff options
| -rw-r--r-- | about.c | 8 | ||||
| -rw-r--r-- | cookie.c | 4 | ||||
| -rw-r--r-- | externaleditor.c | 4 | ||||
| -rw-r--r-- | history.c | 4 | ||||
| -rw-r--r-- | settings.c | 8 | ||||
| -rw-r--r-- | tldlist.c | 2 | ||||
| -rw-r--r-- | whitelist.c | 2 |
7 files changed, 16 insertions, 16 deletions
diff --git a/about.c b/about.c index 411092f..8e2dcce 100644 --- a/about.c +++ b/about.c @@ -189,7 +189,7 @@ load_webkit_string(struct tab *t, const char *str, gchar *title) gtk_spinner_stop(GTK_SPINNER(t->spinner)); gtk_widget_hide(t->spinner); #endif - snprintf(file, sizeof file, "%s/%s", resource_dir, icons[0]); + snprintf(file, sizeof file, "%s" PS "%s", resource_dir, icons[0]); xt_icon_from_file(t, file); } } @@ -577,7 +577,7 @@ remove_favorite(struct tab *t, int index) size_t len, lineno; /* open favorites */ - snprintf(file, sizeof file, "%s/%s", work_dir, XT_FAVS_FILE); + snprintf(file, sizeof file, "%s" PS "%s", work_dir, XT_FAVS_FILE); if ((f = fopen(file, "r")) == NULL) { show_oops(t, "%s: can't open favorites: %s", @@ -661,7 +661,7 @@ add_favorite(struct tab *t, struct karg *args) return (1); } - snprintf(file, sizeof file, "%s/%s", work_dir, XT_FAVS_FILE); + snprintf(file, sizeof file, "%s" PS "%s", work_dir, XT_FAVS_FILE); if ((f = fopen(file, "r+")) == NULL) { show_oops(t, "Can't open favorites file: %s", strerror(errno)); return (1); @@ -967,7 +967,7 @@ xtp_page_fl(struct tab *t, struct karg *args) generate_xtp_session_key(&fl_session_key); /* open favorites */ - snprintf(file, sizeof file, "%s/%s", work_dir, XT_FAVS_FILE); + snprintf(file, sizeof file, "%s" PS "%s", work_dir, XT_FAVS_FILE); if ((f = fopen(file, "r")) == NULL) { show_oops(t, "Can't open favorites file: %s", strerror(errno)); return (1); diff --git a/cookie.c b/cookie.c index 10d71db..518e5c4 100644 --- a/cookie.c +++ b/cookie.c @@ -221,11 +221,11 @@ setup_cookies(void) /* rejected cookies */ if (save_rejected_cookies) - snprintf(rc_fname, sizeof file, "%s/%s", work_dir, + snprintf(rc_fname, sizeof file, "%s" PS "%s", work_dir, XT_REJECT_FILE); /* persistent cookies */ - snprintf(file, sizeof file, "%s/%s", work_dir, XT_COOKIE_FILE); + snprintf(file, sizeof file, "%s" PS "%s", work_dir, XT_COOKIE_FILE); p_cookiejar = soup_cookie_jar_text_new(file, read_only_cookies); /* session cookies */ diff --git a/externaleditor.c b/externaleditor.c index 407dd27..404b906 100644 --- a/externaleditor.c +++ b/externaleditor.c @@ -148,9 +148,9 @@ open_external_editor(struct tab *t, const char *contents, const char *suffix, if (suffix == NULL) suffix = ""; - filename = g_malloc(strlen(temp_dir) + strlen("/xxxtermXXXXXX") + + filename = g_malloc(strlen(temp_dir) + strlen(PS "xxxtermXXXXXX") + strlen(suffix) + 1); - sprintf(filename, "%s/xxxtermXXXXXX%s", temp_dir, suffix); + sprintf(filename, "%s" PS "xxxtermXXXXXX%s", temp_dir, suffix); /* Create a temporary file */ fd = mkstemps(filename, strlen(suffix)); diff --git a/history.c b/history.c index 04430e0..a536275 100644 --- a/history.c +++ b/history.c @@ -99,7 +99,7 @@ restore_global_history(void) struct tm tm; const char delim[3] = {'\\', '\\', '\0'}; - snprintf(file, sizeof file, "%s/%s", work_dir, XT_HISTORY_FILE); + snprintf(file, sizeof file, "%s" PS "%s", work_dir, XT_HISTORY_FILE); if ((f = fopen(file, "r")) == NULL) { warnx("%s: fopen", __func__); @@ -163,7 +163,7 @@ save_global_history_to_disk(struct tab *t) FILE *f; struct history *h; - snprintf(file, sizeof file, "%s/%s", work_dir, XT_HISTORY_FILE); + snprintf(file, sizeof file, "%s" PS "%s", work_dir, XT_HISTORY_FILE); if ((f = fopen(file, "w")) == NULL) { show_oops(t, "%s: global history file: %s", diff --git a/settings.c b/settings.c index 65805c5..ee88167 100644 --- a/settings.c +++ b/settings.c @@ -576,7 +576,7 @@ int set_default_script(struct settings *s, char *val) { if (val[0] == '~') - snprintf(default_script, sizeof default_script, "%s/%s", + snprintf(default_script, sizeof default_script, "%s" PS "%s", pwd->pw_dir, &val[1]); else strlcpy(default_script, val, sizeof default_script); @@ -596,7 +596,7 @@ int set_download_dir(struct settings *s, char *val) { if (val[0] == '~') - snprintf(download_dir, sizeof download_dir, "%s/%s", + snprintf(download_dir, sizeof download_dir, "%s" PS "%s", pwd->pw_dir, &val[1]); else strlcpy(download_dir, val, sizeof download_dir); @@ -1266,7 +1266,7 @@ int set_work_dir(struct settings *s, char *val) { if (val[0] == '~') - snprintf(work_dir, sizeof work_dir, "%s/%s", + snprintf(work_dir, sizeof work_dir, "%s" PS "%s", pwd->pw_dir, &val[1]); else strlcpy(work_dir, val, sizeof work_dir); @@ -1384,7 +1384,7 @@ config_parse(char *filename, int runtime) return; if (runtime && runtime_settings[0] != '\0') { - snprintf(file, sizeof file, "%s/%s", + snprintf(file, sizeof file, "%s" PS "%s", work_dir, runtime_settings); if (stat(file, &sb)) { warnx("runtime file doesn't exist, creating it"); diff --git a/tldlist.c b/tldlist.c index 5b60995..8ef0114 100644 --- a/tldlist.c +++ b/tldlist.c @@ -269,7 +269,7 @@ tld_tree_init() char *rule, *rp; char extra_ch; - snprintf(file, sizeof file, "%s/tld-rules", resource_dir); + snprintf(file, sizeof file, "%s" PS "tld-rules", resource_dir); fd = fopen(file, "r"); if (fd == NULL) { /* a poor replacement for the real list - but it's diff --git a/whitelist.c b/whitelist.c index f9df480..1f1263a 100644 --- a/whitelist.c +++ b/whitelist.c @@ -139,7 +139,7 @@ wl_save(struct tab *t, struct karg *args, int list) goto done; } - snprintf(file, sizeof file, "%s/%s", work_dir, runtime_settings); + snprintf(file, sizeof file, "%s" PS "%s", work_dir, runtime_settings); if ((f = fopen(file, "r+")) == NULL) { show_oops(t, "can't open file %s"); goto done; |