Commit diff
Commit 6e2c4ee5b39ca82816912f84948f7809d1bf5c7
commit 6e2c4ee5b39ca82816912f84948f7809d1bf5c7d
Author: Greg Haerr <greg@censoft.com>
Date: Sun Mar 15 14:43:13 2026 -0700
[build] Remove 'more' from ROMFS image, fix ash build when JOBSP 0
---
elkscmd/Applications | 2 +-
elkscmd/ash/jobs.c | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/elkscmd/Applications b/elkscmd/Applications
index 4ba66412..80f266eb 100644
--- a/elkscmd/Applications
+++ b/elkscmd/Applications
@@ -78,7 +78,7 @@ file_utils/md5sum :fileutil :1440c
file_utils/mkdir :fileutil :360k
file_utils/mknod :fileutil :360k
#file_utils/mkfifo :fileutil :1200k
-file_utils/more :fileutil :360k :128k
+file_utils/more :fileutil :360k
file_utils/mv :fileutil :360k
file_utils/ln :fileutil :720k
file_utils/ls :fileutil :360k :128k :nocomp
diff --git a/elkscmd/ash/jobs.c b/elkscmd/ash/jobs.c
index be7b774c..75c416d8 100644
--- a/elkscmd/ash/jobs.c
+++ b/elkscmd/ash/jobs.c
@@ -179,8 +179,8 @@ bgcmd(argc, argv) char **argv; {
#endif
-#if JOBSP
fgcmd(argc, argv) char **argv; {
+#if JOBSP
struct job *jp;
int status;
@@ -196,9 +196,11 @@ fgcmd(argc, argv) char **argv; {
status = waitforjob(jp);
INTON;
return status;
+#endif
}
+#if JOBSP
STATIC void
restartjob(jp)
struct job *jp;
@@ -652,8 +654,10 @@ waitforjob(jp)
error("TIOCSPGRP failed, errno=%d\n", errno);
}
#endif
+#if JOBSP
if (jp->state == JOBSTOPPED)
curjob = jp - jobtab + 1;
+#endif
status = jp->ps[jp->nprocs - 1].status;
/* convert to 8 bits */
if ((status & 0xFF) == 0)