From d048a96ee9bec968be0bdc9c43ffce61169545be Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Fri, 9 Nov 2007 14:33:54 -0500 Subject: print warning/error/fatal messages in one shot Not doing so is likely to create a messed up display when sent over the sideband protocol. Signed-off-by: Nicolas Pitre Signed-off-by: Junio C Hamano --- usage.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'usage.c') diff --git a/usage.c b/usage.c index f5e652cc76..a5fc4ec5fa 100644 --- a/usage.c +++ b/usage.c @@ -7,9 +7,9 @@ static void report(const char *prefix, const char *err, va_list params) { - fputs(prefix, stderr); - vfprintf(stderr, err, params); - fputs("\n", stderr); + char msg[256]; + vsnprintf(msg, sizeof(msg), err, params); + fprintf(stderr, "%s%s\n", prefix, msg); } static NORETURN void usage_builtin(const char *err) -- cgit v1.2.1 From 07ad5a157d5f73941abfc3a511725d32e4c023d4 Mon Sep 17 00:00:00 2001 From: Nanako Shiraishi Date: Thu, 25 Sep 2008 18:41:04 +0900 Subject: usage.c: remove unused functions This removes three functions that are not used anywhere. Signed-off-by: Nanako Shiraishi Acked-by: Lars Hjemli Signed-off-by: Shawn O. Pearce --- usage.c | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'usage.c') diff --git a/usage.c b/usage.c index a5fc4ec5fa..24f5fc00c2 100644 --- a/usage.c +++ b/usage.c @@ -41,27 +41,11 @@ static void (*die_routine)(const char *err, va_list params) NORETURN = die_built static void (*error_routine)(const char *err, va_list params) = error_builtin; static void (*warn_routine)(const char *err, va_list params) = warn_builtin; -void set_usage_routine(void (*routine)(const char *err) NORETURN) -{ - usage_routine = routine; -} - void set_die_routine(void (*routine)(const char *err, va_list params) NORETURN) { die_routine = routine; } -void set_error_routine(void (*routine)(const char *err, va_list params)) -{ - error_routine = routine; -} - -void set_warn_routine(void (*routine)(const char *warn, va_list params)) -{ - warn_routine = routine; -} - - void usage(const char *err) { usage_routine(err); -- cgit v1.2.1 From 389d17677187f5e996022b7b8e0faf800608cb3a Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Tue, 24 Mar 2009 16:10:35 -0700 Subject: Increase the size of the die/warning buffer to avoid truncation Long messages like those from lockfile.c when a lock can't be obtained truncate with only 256 bytes in the message buffer. Bump it to 1024 to give more space for these longer cases. Signed-off-by: Shawn O. Pearce Signed-off-by: Junio C Hamano --- usage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'usage.c') diff --git a/usage.c b/usage.c index 24f5fc00c2..820d09f92b 100644 --- a/usage.c +++ b/usage.c @@ -7,7 +7,7 @@ static void report(const char *prefix, const char *err, va_list params) { - char msg[256]; + char msg[1024]; vsnprintf(msg, sizeof(msg), err, params); fprintf(stderr, "%s%s\n", prefix, msg); } -- cgit v1.2.1 From b875036e5a2ab569a2123abe9ebfe25258227951 Mon Sep 17 00:00:00 2001 From: Thomas Rast Date: Sat, 27 Jun 2009 17:58:44 +0200 Subject: Introduce die_errno() that appends strerror(errno) to die() There are many calls to die() that do, or should, report strerror(errno) to indicate how the syscall they guard failed. Introduce a small helper function for this case. Note: - POSIX says vsnprintf can modify errno in some unlikely cases, so we have to use errno early. - We take some care to pass the original format to die_routine(), in case someone wants to call die_errno() with custom format characters. Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano --- usage.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'usage.c') diff --git a/usage.c b/usage.c index 820d09f92b..fd936a1aeb 100644 --- a/usage.c +++ b/usage.c @@ -60,6 +60,18 @@ void die(const char *err, ...) va_end(params); } +void die_errno(const char *fmt, ...) +{ + va_list params; + char fmt_with_err[1024]; + + snprintf(fmt_with_err, sizeof(fmt_with_err), "%s: %s", fmt, strerror(errno)); + + va_start(params, fmt); + die_routine(fmt_with_err, params); + va_end(params); +} + int error(const char *err, ...) { va_list params; -- cgit v1.2.1 From f8b5a8e13cb4d60c8b630f92a8f07590ef218ec5 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 27 Jun 2009 17:58:45 +0200 Subject: die_errno(): double % in strerror() output just in case [tr: handle border case where % is placed at end of buffer] Signed-off-by: Junio C Hamano Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano --- usage.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'usage.c') diff --git a/usage.c b/usage.c index fd936a1aeb..b6aea45280 100644 --- a/usage.c +++ b/usage.c @@ -64,8 +64,24 @@ void die_errno(const char *fmt, ...) { va_list params; char fmt_with_err[1024]; - - snprintf(fmt_with_err, sizeof(fmt_with_err), "%s: %s", fmt, strerror(errno)); + char str_error[256], *err; + int i, j; + + err = strerror(errno); + for (i = j = 0; err[i] && j < sizeof(str_error) - 1; ) { + if ((str_error[j++] = err[i++]) != '%') + continue; + if (j < sizeof(str_error) - 1) { + str_error[j++] = '%'; + } else { + /* No room to double the '%', so we overwrite it with + * '\0' below */ + j--; + break; + } + } + str_error[j] = 0; + snprintf(fmt_with_err, sizeof(fmt_with_err), "%s: %s", fmt, str_error); va_start(params, fmt); die_routine(fmt_with_err, params); -- cgit v1.2.1