considerable clean up
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11567 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 1998 - 2002 Kungliga Tekniska H<>gskolan
|
* Copyright (c) 1998 - 2003 Kungliga Tekniska H<>gskolan
|
||||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
@@ -42,38 +42,14 @@ RCSID("$Id$");
|
|||||||
void
|
void
|
||||||
print_version(const char *progname)
|
print_version(const char *progname)
|
||||||
{
|
{
|
||||||
const char *arg[] = VERSIONLIST;
|
const char *package_list = VERSIONLIST;
|
||||||
const int num_args = sizeof(arg) / sizeof(arg[0]);
|
|
||||||
char *msg;
|
|
||||||
size_t len = 0;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
if(progname == NULL)
|
if(progname == NULL)
|
||||||
progname = getprogname();
|
progname = getprogname();
|
||||||
|
|
||||||
if(num_args == 0)
|
if(*package_list == '\0')
|
||||||
msg = "no version information";
|
package_list = "no version information";
|
||||||
else {
|
fprintf(stderr, "%s (%s)\n", progname, package_list);
|
||||||
for(i = 0; i < num_args; i++) {
|
fprintf(stderr, "Copyright 1999-2003 Kungliga Tekniska H<>gskolan\n");
|
||||||
if(i > 0)
|
|
||||||
len += 2;
|
|
||||||
len += strlen(arg[i]);
|
|
||||||
}
|
|
||||||
msg = malloc(len + 1);
|
|
||||||
if(msg == NULL) {
|
|
||||||
fprintf(stderr, "%s: out of memory\n", progname);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
msg[0] = '\0';
|
|
||||||
for(i = 0; i < num_args; i++) {
|
|
||||||
if(i > 0)
|
|
||||||
strcat(msg, ", ");
|
|
||||||
strcat(msg, arg[i]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
fprintf(stderr, "%s (%s)\n", progname, msg);
|
|
||||||
fprintf(stderr, "Copyright (c) 1999-2002 Kungliga Tekniska H<>gskolan\n");
|
|
||||||
fprintf(stderr, "Send bug-reports to %s\n", PACKAGE_BUGREPORT);
|
fprintf(stderr, "Send bug-reports to %s\n", PACKAGE_BUGREPORT);
|
||||||
if(num_args != 0)
|
|
||||||
free(msg);
|
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user