diff options
| -rw-r--r-- | lib/ChangeLog | 5 | ||||
| -rw-r--r-- | lib/command.c | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog index ad81ed5f..7c928c6b 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2005-01-14 Andrew J. Schorr <ajschorr@alumni.princeton.edu> + + * command.c (print_version): Do not bother even to examine host.name, + since it is always NULL when this function is called from main. + 2005-01-14 Greg Troxel <gdt@fnord.ir.bbn.com> * command.c (print_version): Don't print host.name if it is NULL. diff --git a/lib/command.c b/lib/command.c index 3891733b..92bbac75 100644 --- a/lib/command.c +++ b/lib/command.c @@ -1,5 +1,5 @@ /* - $Id: command.c,v 1.32 2005/01/14 15:47:33 gdt Exp $ + $Id: command.c,v 1.33 2005/01/14 17:09:38 ajs Exp $ Command interpreter routine for virtual terminal [aka TeletYpe] Copyright (C) 1997, 98, 99 Kunihiro Ishiguro @@ -142,13 +142,12 @@ level_match(const char *s) return ZLOG_DISABLED; } +/* This is called from main when a daemon is invoked with -v or --version. */ void print_version (const char *progname) { - printf ("%s version %s", progname, QUAGGA_VERSION); - if (host.name != NULL) - printf (" (%s)", host.name); - printf ("\n%s\n", QUAGGA_COPYRIGHT); + printf ("%s version %s\n", progname, QUAGGA_VERSION); + printf ("%s\n", QUAGGA_COPYRIGHT); } |