drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* dump_setup.cc (compar): Use case insensitive comparisons. 

(dump_setup): Calculate package_len based on already used "len".  Don't bother
with version_len.
This commit is contained in:
Christopher Faylor 2003-02-07 21:34:34 +00:00
parent eceb45bdff
commit 3202ad2b9e
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/utils/ChangeLog
View File

@ -1,3 +1,9 @@
2003-02-07 Christopher Faylor <cgf@redhat.com>
* dump_setup.cc (compar): Use case insensitive comparisons.
(dump_setup): Calculate package_len based on already used "len". Don't
bother with version_len.
2003-02-07 Igor Pechtchanski <pechtcha@cs.nyu.edu> 2003-02-07 Igor Pechtchanski <pechtcha@cs.nyu.edu>
* dump_setup.cc (dump_setup): Compute the longest package name * dump_setup.cc (dump_setup): Compute the longest package name

16
winsup/utils/dump_setup.cc
View File

@ -18,7 +18,6 @@ details. */
#include "path.h" #include "path.h"
static int package_len = 20; static int package_len = 20;
static int version_len = 20;
typedef struct typedef struct
@ -159,7 +158,7 @@ compar (const void *a, const void *b)
{ {
const pkgver *pa = (const pkgver *) a; const pkgver *pa = (const pkgver *) a;
const pkgver *pb = (const pkgver *) b; const pkgver *pb = (const pkgver *) b;
return strcmp (pa->name, pb->name); return strcasecmp (pa->name, pb->name);
} }
} }
@ -220,17 +219,13 @@ dump_setup (int verbose, char **argv, bool /*check_files*/)
int len = strlen (package); int len = strlen (package);
if (f.what[0]) if (f.what[0])
len += strlen (f.what) + 1; len += strlen (f.what) + 1;
if (len > package_len)
package_len = len;
packages[n].name = (char *) malloc (len + 1); packages[n].name = (char *) malloc (len + 1);
strcpy (packages[n].name , package); strcpy (packages[n].name , package);
if (f.what[0]) if (f.what[0])
strcat (strcat (packages[n].name, "-"), f.what); strcat (strcat (packages[n].name, "-"), f.what);
int pkg_len = strlen(packages[n].name);
if (package_len < pkg_len+1)
package_len = pkg_len+1;
packages[n].ver = strdup (f.ver); packages[n].ver = strdup (f.ver);
int ver_len = strlen(packages[n].ver);
if (version_len < ver_len+1)
version_len = ver_len+1;
n++; n++;
if (strtok (NULL, " ") == NULL) if (strtok (NULL, " ") == NULL)
break; break;
@ -239,10 +234,9 @@ dump_setup (int verbose, char **argv, bool /*check_files*/)
qsort (packages, n, sizeof (packages[0]), compar); qsort (packages, n, sizeof (packages[0]), compar);
printf ("%-*s%-*s\n", package_len, "Package", version_len, "Version"); printf ("%-*s %s\n", package_len, "Package", "Version");
for (int i = 0; i < n; i++) for (int i = 0; i < n; i++)
printf ("%-*s%-*s\n", package_len, packages[i].name, printf ("%-*s %s\n", package_len, packages[i].name, packages[i].ver);
version_len, packages[i].ver);
fclose (fp); fclose (fp);
return; return;