Skip to content

Commit

Permalink
Customizable error handlers
Browse files Browse the repository at this point in the history
This patch makes the usage(), die() and error() handlers customizable.
Nothing in the git code itself uses that but many other libgit users
(like Git.pm) will.

This is implemented using the mutator functions primarily because you
cannot directly modifying global variables of libgit from a program that
dlopen()ed it, apparently. But having functions for that is a better API
anyway.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Petr Baudis authored and Junio C Hamano committed Jun 24, 2006
1 parent 5e7c91d commit 39a3f5e
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 4 deletions.
4 changes: 4 additions & 0 deletions git-compat-util.h
Expand Up @@ -40,6 +40,10 @@ extern void usage(const char *err) NORETURN;
extern void die(const char *err, ...) NORETURN __attribute__((format (printf, 1, 2)));
extern int error(const char *err, ...) __attribute__((format (printf, 1, 2)));

extern void set_usage_routine(void (*routine)(const char *err) NORETURN);
extern void set_die_routine(void (*routine)(const char *err, va_list params) NORETURN);
extern void set_error_routine(void (*routine)(const char *err, va_list params));

#ifdef NO_MMAP

#ifndef PROT_READ
Expand Down
46 changes: 42 additions & 4 deletions usage.c
Expand Up @@ -12,28 +12,66 @@ static void report(const char *prefix, const char *err, va_list params)
fputs("\n", stderr);
}

void usage(const char *err)
void usage_builtin(const char *err)
{
fprintf(stderr, "usage: %s\n", err);
exit(129);
}

void die_builtin(const char *err, va_list params)
{
report("fatal: ", err, params);
exit(128);
}

void error_builtin(const char *err, va_list params)
{
report("error: ", err, params);
}


/* If we are in a dlopen()ed .so write to a global variable would segfault
* (ugh), so keep things static. */
static void (*usage_routine)(const char *err) NORETURN = usage_builtin;
static void (*die_routine)(const char *err, va_list params) NORETURN = die_builtin;
static void (*error_routine)(const char *err, va_list params) = error_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 usage(const char *err)
{
usage_routine(err);
}

void die(const char *err, ...)
{
va_list params;

va_start(params, err);
report("fatal: ", err, params);
die_routine(err, params);
va_end(params);
exit(128);
}

int error(const char *err, ...)
{
va_list params;

va_start(params, err);
report("error: ", err, params);
error_routine(err, params);
va_end(params);
return -1;
}

0 comments on commit 39a3f5e

Please sign in to comment.