diff --git a/bar-1.10.9-Werror=format-security.patch b/bar-1.10.9-Werror=format-security.patch index 6430c9e..7824f3d 100644 --- a/bar-1.10.9-Werror=format-security.patch +++ b/bar-1.10.9-Werror=format-security.patch @@ -1,12 +1,12 @@ -diff -up bar-1.10.9/args.c.orig bar-1.10.9/args.c ---- bar-1.10.9/args.c.orig 2014-06-12 15:37:42.884747232 -0400 -+++ bar-1.10.9/args.c 2007-06-28 09:09:58.000000000 -0400 +diff -up bar-1.10.9/args.c.format-security bar-1.10.9/args.c +--- bar-1.10.9/args.c.format-security 2014-06-12 16:01:36.990747232 -0400 ++++ bar-1.10.9/args.c 2014-06-12 16:04:20.065747232 -0400 @@ -587,7 +587,7 @@ void help(FILE *out) fprintf(out, "\n "); screen_used = 7; } -- fprintf(out, "%s", option_buffer); -+ fprintf(out, option_buffer); +- fprintf(out, option_buffer); ++ fprintf(out, "%s", option_buffer); screen_used += strlen(option_buffer); } @@ -14,29 +14,14 @@ diff -up bar-1.10.9/args.c.orig bar-1.10.9/args.c fprintf(out, "\n "); screen_used = 7; } -- fprintf(out, "%s", option_buffer); -+ fprintf(out, option_buffer); +- fprintf(out, option_buffer); ++ fprintf(out, "%s", option_buffer); screen_used += strlen(option_buffer); } -@@ -2808,12 +2808,12 @@ int parse_rcfiles(FILE *ferr) - - home_dir = getenv("HOME"); - if (home_dir != 0) { -- sprintf(filename, "%.*s/.clpbarrc", 4091, home_dir); -+ sprintf(filename, "%.*s/.barrc", 4088, home_dir); - if (parse_rcfile(ferr, filename) != 0) - return(1); - } - -- sprintf(filename, "./.clpbarrc"); -+ sprintf(filename, "./.barrc"); - if (parse_rcfile(ferr, filename) != 0) - return(1); - -diff -up bar-1.10.9/display.c.orig bar-1.10.9/display.c ---- bar-1.10.9/display.c.orig 2007-06-06 15:07:41.000000000 -0400 -+++ bar-1.10.9/display.c 2014-06-12 15:36:51.132747232 -0400 +diff -up bar-1.10.9/display.c.format-security bar-1.10.9/display.c +--- bar-1.10.9/display.c.format-security 2007-06-06 15:07:41.000000000 -0400 ++++ bar-1.10.9/display.c 2014-06-12 16:03:29.713747232 -0400 @@ -308,10 +308,10 @@ void displayAnsi(char *fg, char *bg, int { if (d.display_ansi) {