git/usage.c, branch v1.7.0.5

Fix truncated usage messages

2009-11-23T00:14:48Z

The usage messages for some commands (such as 'git diff-tree') are truncated because they don't fit in a fixed buffer of 1024 bytes. It would be tempting to eliminate the buffer and the problem once and for all by doing the output in three steps, but doing so could (according to commit d048a96e) increase the likelyhood of messing up the display. So we just increase the size of the buffer. Signed-off-by: Björn Gustavsson Signed-off-by: Junio C Hamano

Introduce usagef() that takes a printf-style format

2009-11-10T20:00:21Z

Some new callers would want to use printf-like formatting, when issuing their usage messages. An option is to change usage() itself also be like printf(), which would make it similar to die() and warn(). But usage() is typically fixed, as opposed to die() and warn() that gives diagnostics depending on the situation. Indeed, the majority of strings given by existing callsites to usage() are fixed strings. If we were to make usage() take printf-style format, they all need to be changed to have "%s" as their first argument. So instead, introduce usagef() so that limited number of callers can use it. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano

add NORETURN_PTR for function pointers

2009-10-01T08:12:21Z

Some compilers (including at least MSVC and ARM RVDS) supports NORETURN on function declarations, but not on function pointers. This patch makes it possible to define NORETURN for these compilers, by splitting the NORETURN macro into two - one for function declarations and one for function pointers. Signed-off-by: Erik Faye-Lund Signed-off-by: Jeff King

increase portability of NORETURN declarations

2009-10-01T08:12:21Z

Some compilers (including at least MSVC) support NORETURN on function declarations, but only before the function-name. This patch makes it possible to define NORETURN to something meaningful for those compilers. Signed-off-by: Erik Faye-Lund Signed-off-by: Jeff King

die_errno(): double % in strerror() output just in case

2009-06-27T18:14:53Z

[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

Introduce die_errno() that appends strerror(errno) to die()

2009-06-27T18:14:53Z

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

Increase the size of the die/warning buffer to avoid truncation

2009-03-24T23:58:20Z

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: remove unused functions

2008-09-29T14:30:16Z

This removes three functions that are not used anywhere. Signed-off-by: Nanako Shiraishi Acked-by: Lars Hjemli Signed-off-by: Shawn O. Pearce

print warning/error/fatal messages in one shot

2007-11-10T06:25:36Z

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

Rename warn() to warning() to fix symbol conflicts on BSD and Mac OS

2007-03-31T08:11:11Z

This fixes a problem reported by Randal Schwartz: >I finally tracked down all the (albeit inconsequential) errors I was getting >on both OpenBSD and OSX. It's the warn() function in usage.c. There's >warn(3) in BSD-style distros. It'd take a "great rename" to change it, but if >someone with better C skills than I have could do that, my linker and I would >appreciate it. It was annoying to me, too, when I was doing some mergetool testing on Mac OS X, so here's a fix. Signed-off-by: "Theodore Ts'o" Cc: "Randal L. Schwartz" Signed-off-by: Junio C Hamano