From 25687b0f76a010eecdbbce44aea5b2ba328a537e Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Wed, 27 Aug 2008 20:11:11 +0000 Subject: * cygcheck.cc (nuke): Use malloc rather than alloca for environment variables. (load_cygwin): Ditto. * dump_setup.cc (parse_filename): Cosmetic changes. (get_packages): Ditto. --- winsup/utils/dump_setup.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'winsup/utils/dump_setup.cc') diff --git a/winsup/utils/dump_setup.cc b/winsup/utils/dump_setup.cc index 9594eb1d5..3e71f1a02 100644 --- a/winsup/utils/dump_setup.cc +++ b/winsup/utils/dump_setup.cc @@ -94,14 +94,14 @@ parse_filename (const char *in_fn, fileparse& f) if (*ver == '-') if (isdigit (ver[1])) { - *ver++ = 0; + *ver++ = '\0'; strcpy (f.pkg, p); break; } else if (strcasecmp (ver, "-src") == 0 || strcasecmp (ver, "-patch") == 0) { - *ver++ = 0; + *ver++ = '\0'; strcpy (f.pkg, p); strcpy (f.what, strlwr (ver)); strcpy (f.pkgtar, p); @@ -311,7 +311,8 @@ check_package_files (int verbose, char *package) * The last entry in the list is {NULL,NULL}. */ static pkgver * -get_packages (char **argv) { +get_packages (char **argv) +{ char *setup = cygpath ("/etc/setup/installed.db", NULL); FILE *fp = fopen (setup, "rt"); @@ -352,7 +353,7 @@ get_packages (char **argv) { if (len > package_len) package_len = len; packages[n].name = (char *) malloc (len + 1); - strcpy (packages[n].name , package); + strcpy (packages[n].name, package); if (f.what[0]) strcat (strcat (packages[n].name, "-"), f.what); packages[n].ver = strdup (f.ver); -- cgit v1.2.3