wt/finit
1
0 Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-11-10 16:31:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Run-parts code cleanup and minor fixes

Browse Source 
Signed-off-by: Claudio Matsuoka <cmatsuoka@gmail.com>
This commit is contained in:
Claudio Matsuoka committed 2008-03-16 12:47:37 -03:00
1 parent f972ff4d30
commit 1c88ae1f61
2 files changed
+10 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Makefile
+3 -1
View File
@@ -33,7 +33,7 @@ CFLAGS += -march=pentium-m
#CFLAGS += -DDIRECTISA #CFLAGS += -DDIRECTISA
# Use built-in run-parts instead of /bin/run-parts # Use built-in run-parts instead of /bin/run-parts
#CFLAGS += BUILTIN_RUNPARTS CFLAGS += -DBUILTIN_RUNPARTS
ifneq ($(USER), "user") ifneq ($(USER), "user")
CFLAGS += -DDEFUSER=\"$(USER)\" CFLAGS += -DDEFUSER=\"$(USER)\"
@@ -67,6 +67,8 @@ finit.o: finit.c Makefile
finit-mod.o: finit-mod.c Makefile finit-mod.o: finit-mod.c Makefile
helpers.o: helpers.c Makefile
dist: dist:
rm -Rf $(PKG) rm -Rf $(PKG)
mkdir -p $(PKG)/contrib mkdir -p $(PKG)/contrib
helpers.c
+7 -11
View File
@@ -117,24 +117,18 @@ int run_parts(char *dir, ...)
char *args[NUM_ARGS]; char *args[NUM_ARGS];
va_list ap; va_list ap;
if ((d = opendir(dir)) == NULL)
return -1;
if (chdir(dir)) if (chdir(dir))
return -1; return -1;
if ((d = opendir(dir)) == NULL)
return -1;
va_start(ap, dir); va_start(ap, dir);
while (argnum < NUM_ARGS && (args[argnum++] = va_arg(ap, char *))); while (argnum < NUM_ARGS && (args[argnum++] = va_arg(ap, char *)));
va_end(ap); va_end(ap);
while (1) { while ((e = readdir(d))) {
if ((e = readdir(d)) == NULL) if (e->d_type == DT_REG && stat(e->d_name, &st) == 0) {
break;
if (e->d_type == DT_REG) {
if (stat(e->d_name, &st))
continue;
if (st.st_mode & S_IXUSR) { if (st.st_mode & S_IXUSR) {
ent[num++] = strdup(e->d_name); ent[num++] = strdup(e->d_name);
if (num >= NUM_SCRIPTS) if (num >= NUM_SCRIPTS)
@@ -143,6 +137,8 @@ int run_parts(char *dir, ...)
} }
} }
closedir(d);
if (num == 0) if (num == 0)
return 0; return 0;