diff -ruN chkconfig-1.3.4-mdk/chkconfig.c chkconfig-1.3.4/chkconfig.c --- chkconfig-1.3.4-mdk/chkconfig.c Sat May 4 16:11:18 2002 +++ chkconfig-1.3.4/chkconfig.c Fri May 10 15:00:01 2002 @@ -118,17 +118,9 @@ while ((ent = readdir(dir))) { const char *dn; - /* Skip any file starting with a . */ - if (ent->d_name[0] == '.') continue; - /* Skip files with known bad extensions */ - if ((dn = strrchr(ent->d_name, '.')) != NULL && - (!strcmp(dn, ".rpmsave") || !strcmp(dn, ".rpmnew") || !strcmp(dn, ".rpmorig") || !strcmp(dn, ".swp"))) - continue; - - dn = ent->d_name + strlen(ent->d_name) - 1; - if (*dn == '~' || *dn == ',') - continue; + if (strchr(ent->d_name, '~') || strchr(ent->d_name, ',') || + strchr(ent->d_name, '.')) continue; sprintf(fn, RUNLEVELS "/init.d/%s", ent->d_name); if (stat(fn, &sb)) { @@ -275,18 +267,10 @@ while ((ent = readdir(dir))) { const char *dn; - /* Skip any file starting with a . */ - if (ent->d_name[0] == '.') continue; - /* Skip files with known bad extensions */ - if ((dn = strrchr(ent->d_name, '.')) != NULL && - (!strcmp(dn, ".rpmsave") || !strcmp(dn, ".rpmnew") || !strcmp(dn, ".rpmorig") || !strcmp(dn, ".swp"))) - continue; + if (strchr(ent->d_name, '~') || strchr(ent->d_name, ',') || + strchr(ent->d_name, '.')) continue; - dn = ent->d_name + strlen(ent->d_name) - 1; - if (*dn == '~' || *dn == ',') - continue; - sprintf(fn, RUNLEVELS "/init.d/%s", ent->d_name); if (stat(fn, &sb)) { err = errno; @@ -319,17 +303,9 @@ const char *dn; struct service s; - /* Skip any file starting with a . */ - if (ent->d_name[0] == '.') continue; - /* Skip files with known bad extensions */ - if ((dn = strrchr(ent->d_name, '.')) != NULL && - (!strcmp(dn, ".rpmsave") || !strcmp(dn, ".rpmnew") || !strcmp(dn, ".rpmorig") || !strcmp(dn, ".swp"))) - continue; - - dn = ent->d_name + strlen(ent->d_name) - 1; - if (*dn == '~' || *dn == ',') - continue; + if (strchr(ent->d_name, '~') || strchr(ent->d_name, ',') || + strchr(ent->d_name, '.')) continue; readXinetdServiceInfo(ent->d_name, &s, 0); printf("\t%s:\t%s\n", s.name, s.levels ? _("on") : _("off"));