aboutsummaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/cat.c28
-rw-r--r--coreutils/dd.c425
-rw-r--r--coreutils/pwd.c3
-rw-r--r--coreutils/sleep.c21
4 files changed, 200 insertions, 277 deletions
diff --git a/coreutils/cat.c b/coreutils/cat.c
index 8718c4d02..5c54c4941 100644
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -22,15 +22,27 @@
#include "internal.h"
#include <stdio.h>
-const char cat_usage[] = "[file ...]";
-extern int cat_more_main(int argc, char **argv)
+static void print_file( FILE *file)
{
int c;
- FILE *file = stdin;
+ while ((c = getc(file)) != EOF)
+ putc(c, stdout);
+ fclose(file);
+ fflush(stdout);
+}
+
+extern int cat_more_main(int argc, char **argv)
+{
+ FILE *file;
+
+ if (argc==1) {
+ print_file( stdin);
+ exit( TRUE);
+ }
- if ( (argc < 2) || (**(argv+1) == '-') ) {
- fprintf(stderr, "Usage: %s %s", *argv, cat_usage);
+ if ( **(argv+1) == '-' ) {
+ fprintf(stderr, "Usage: cat [file ...]\n");
exit(FALSE);
}
argc--;
@@ -42,11 +54,7 @@ extern int cat_more_main(int argc, char **argv)
perror(*argv);
exit(FALSE);
}
- while ((c = getc(file)) != EOF)
- putc(c, stdout);
- fclose(file);
- fflush(stdout);
-
+ print_file( file);
argc--;
argv++;
}
diff --git a/coreutils/dd.c b/coreutils/dd.c
index 07f092cc2..40288fd4d 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -6,302 +6,211 @@
* The "dd" command, originally taken from sash.
*
* Permission to distribute this code under the GPL has been granted.
- * Majorly modified, and bugs fixed for busybox by Erik Andersen <andersee@debian.org> <andersen@lineo.com>
+ * Mostly rewritten and bugs fixed for busybox by Erik Andersen <andersee@debian.org>
*/
#include "internal.h"
-#ifdef BB_DD
+#include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
-const char dd_usage[] =
-"Copy a file, converting and formatting according to options\n\
+const char dd_usage[] =
+ "Copy a file, converting and formatting according to options\n\
\n\
usage: [if=name] [of=name] [bs=n] [count=n]\n\
\tif=FILE\tread from FILE instead of stdin\n\
\tof=FILE\twrite to FILE instead of stout\n\
\tbs=n\tread and write N bytes at a time\n\
\tcount=n\tcopy only n input blocks\n\
+\tskip=n\tskip n input blocks\n\
\n\
BYTES may be suffixed: by k for x1024, b for x512, and w for x2.\n";
-#include <stdio.h>
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <time.h>
-
-
-#define PAR_NONE 0
-#define PAR_IF 1
-#define PAR_OF 2
-#define PAR_BS 3
-#define PAR_COUNT 4
-typedef struct
+/*
+ * Read a number with a possible multiplier.
+ * Returns -1 if the number format is illegal.
+ */
+static long getNum (const char *cp)
{
- const char * name;
- int value;
-} PARAM;
+ long value;
+ if (!isDecimal (*cp))
+ return -1;
-static const PARAM params[] =
-{
- {"if", PAR_IF},
- {"of", PAR_OF},
- {"bs", PAR_BS},
- {"count", PAR_COUNT},
- {NULL, PAR_NONE}
-};
-
+ value = 0;
-static long getNum(const char * cp);
+ while (isDecimal (*cp))
+ value = value * 10 + *cp++ - '0';
-extern int
-dd_main (int argc, char **argv)
-{
- const char * str;
- const PARAM * par;
- const char * inFile;
- const char * outFile;
- char * cp;
- int inFd;
- int outFd;
- int inCc=0;
- int outCc;
- int blockSize;
- long count;
- long intotal;
- long outTotal;
- unsigned char* buf;
- unsigned char localBuf[BUF_SIZE];
-
- inFile = NULL;
- outFile = NULL;
- blockSize = 512;
- count = 1;
-
-
- while (--argc > 0)
- {
- str = *++argv;
- cp = strchr(str, '=');
-
- if (cp == NULL)
- {
- fprintf(stderr, "Bad dd argument\n");
- goto usage;
- }
-
- *cp++ = '\0';
-
- for (par = params; par->name; par++)
- {
- if (strcmp(str, par->name) == 0)
- break;
- }
-
- switch (par->value)
- {
- case PAR_IF:
- if (inFile)
- {
- fprintf(stderr, "Multiple input files illegal\n");
- goto usage;
- }
-
- //fprintf(stderr, "if=%s\n", cp);
- inFile = cp;
- break;
-
- case PAR_OF:
- if (outFile)
- {
- fprintf(stderr, "Multiple output files illegal\n");
- goto usage;
- }
-
- //fprintf(stderr, "of=%s\n", cp);
- outFile = cp;
- break;
-
- case PAR_BS:
- blockSize = getNum(cp);
- //fprintf(stderr, "bs=%d\n", blockSize);
-
- if (blockSize <= 0)
- {
- fprintf(stderr, "Bad block size value\n");
- goto usage;
- }
-
- break;
-
- case PAR_COUNT:
- count = getNum(cp);
- //fprintf(stderr, "count=%ld\n", count);
-
- if (count < 0)
- {
- fprintf(stderr, "Bad count value\n");
- goto usage;
- }
-
- break;
-
- default:
- goto usage;
- }
- }
+ switch (*cp++) {
+ case 'k':
+ value *= 1024;
+ break;
- buf = localBuf;
+ case 'b':
+ value *= 512;
+ break;
- if (blockSize > sizeof(localBuf))
- {
- buf = malloc(blockSize);
+ case 'w':
+ value *= 2;
+ break;
- if (buf == NULL)
- {
- fprintf(stderr, "Cannot allocate buffer\n");
- return 1;
- }
- }
+ case '\0':
+ return value;
- intotal = 0;
- outTotal = 0;
+ default:
+ return -1;
+ }
- if (inFile == NULL)
- inFd = STDIN;
- else
- inFd = open(inFile, 0);
+ if (*cp)
+ return -1;
- if (inFd < 0)
- {
- perror(inFile);
+ return value;
+}
- if (buf != localBuf)
- free(buf);
- return 1;
+extern int dd_main (int argc, char **argv)
+{
+ const char *inFile;
+ const char *outFile;
+ char *cp;
+ int inFd;
+ int outFd;
+ int inCc = 0;
+ int outCc;
+ int skipBlocks;
+ int blockSize;
+ long count;
+ long intotal;
+ long outTotal;
+ unsigned char *buf;
+
+ inFile = NULL;
+ outFile = NULL;
+ blockSize = 512;
+ skipBlocks = 0;
+ count = 1;
+
+
+ argc--;
+ argv++;
+
+ /* Parse any options */
+ while (argc) {
+ if (inFile == NULL && (strncmp("if", *argv, 2) == 0))
+ inFile=*argv;
+ else if (outFile == NULL && (strncmp("of", *argv, 2) == 0))
+ outFile=*argv;
+ else if (strncmp("count", *argv, 5) == 0) {
+ count = getNum (*argv);
+ if (count <= 0) {
+ fprintf (stderr, "Bad count value %ld\n", count);
+ goto usage;
+ }
}
-
- if (outFile == NULL)
- outFd = STDOUT;
- else
- outFd = creat(outFile, 0666);
-
- if (outFd < 0)
- {
- perror(outFile);
- close(inFd);
-
- if (buf != localBuf)
- free(buf);
-
- return 1;
+ else if (strncmp("bs", *argv, 2) == 0) {
+ blockSize = getNum(*argv);
+ if (blockSize <= 0) {
+ fprintf (stderr, "Bad block size value %d\n", blockSize);
+ goto usage;
+ }
}
+ else if (strncmp("skip", *argv, 4) == 0) {
+ skipBlocks = atoi( *argv);
+ if (skipBlocks <= 0) {
+ fprintf (stderr, "Bad skip value %d\n", skipBlocks);
+ goto usage;
+ }
- while ( outTotal < count*blockSize )
- {
- inCc = read(inFd, buf, blockSize);
- if (inCc < 0) {
- perror(inFile);
- goto cleanup;
- }
- //fprintf(stderr, "read in =%d\n", inCc);
- intotal += inCc;
- cp = buf;
-
-
- while ( intotal > outTotal )
- {
- if (outTotal+inCc > count*blockSize)
- inCc=count*blockSize-outTotal;
- outCc = write(outFd, cp, inCc);
- if (outCc < 0)
- {
- perror(outFile);
- goto cleanup;
- }
- //fprintf(stderr, "wrote out =%d\n", outCc);
-
- inCc -= outCc;
- cp += outCc;
- outTotal += outCc;
- //fprintf(stderr, "outTotal=%ld\n", outTotal);
- }
}
+ else {
+ fprintf (stderr, "Got here. argv=%s\n", *argv);
+ goto usage;
- if (inCc < 0)
- perror(inFile);
-
-cleanup:
- close(inFd);
-
- if (close(outFd) < 0)
- perror(outFile);
-
- if (buf != localBuf)
- free(buf);
-
- printf("%ld+%d records in\n", intotal / blockSize,
- (intotal % blockSize) != 0);
-
- printf("%ld+%d records out\n", outTotal / blockSize,
- (outTotal % blockSize) != 0);
- return 0;
-usage:
-
- fprintf(stderr, "%s", dd_usage);
- return 1;
-}
-
-
-/*
- * Read a number with a possible multiplier.
- * Returns -1 if the number format is illegal.
- */
-static long
-getNum(const char * cp)
-{
- long value;
-
- if (!isDecimal(*cp))
- return -1;
-
- value = 0;
-
- while (isDecimal(*cp))
- value = value * 10 + *cp++ - '0';
-
- switch (*cp++)
- {
- case 'k':
- value *= 1024;
- break;
-
- case 'b':
- value *= 512;
- break;
-
- case 'w':
- value *= 2;
- break;
+ argc--;
+ argv++;
+ }
+ }
+ if ( inFile == NULL || outFile == NULL)
+ goto usage;
+
+ buf = malloc (blockSize);
+ if (buf == NULL) {
+ fprintf (stderr, "Cannot allocate buffer\n");
+ return( FALSE);
+ }
+
+ intotal = 0;
+ outTotal = 0;
+
+ if (!inFile)
+ inFd = STDIN;
+ else
+ inFd = open (inFile, 0);
+
+ if (inFd < 0) {
+ perror (inFile);
+ free (buf);
+ return( FALSE);
+ }
+
+ if (!outFile)
+ outFd = STDOUT;
+ else
+ outFd = creat (outFile, 0666);
+
+ if (outFd < 0) {
+ perror (outFile);
+ close (inFd);
+ free (buf);
+ return( FALSE);
+ }
+
+ lseek(inFd, skipBlocks*blockSize, SEEK_SET);
+ while (outTotal < count * blockSize) {
+ inCc = read (inFd, buf, blockSize);
+ if (inCc < 0) {
+ perror (inFile);
+ goto cleanup;
+ }
+ intotal += inCc;
+ cp = buf;
+
+ while (intotal > outTotal) {
+ if (outTotal + inCc > count * blockSize)
+ inCc = count * blockSize - outTotal;
+ outCc = write (outFd, cp, inCc);
+ if (outCc < 0) {
+ perror (outFile);
+ goto cleanup;
+ }
+
+ inCc -= outCc;
+ cp += outCc;
+ outTotal += outCc;
+ }
+ }
- case '\0':
- return value;
+ if (inCc < 0)
+ perror (inFile);
- default:
- return -1;
- }
+ cleanup:
+ close (inFd);
+ close (outFd);
+ free (buf);
- if (*cp)
- return -1;
+ printf ("%ld+%d records in\n", intotal / blockSize,
+ (intotal % blockSize) != 0);
+ printf ("%ld+%d records out\n", outTotal / blockSize,
+ (outTotal % blockSize) != 0);
+ exit( TRUE);
+ usage:
- return value;
+ fprintf (stderr, "%s", dd_usage);
+ exit( FALSE);
}
-#endif
-/* END CODE */
diff --git a/coreutils/pwd.c b/coreutils/pwd.c
index 893ed1e15..2ad019d50 100644
--- a/coreutils/pwd.c
+++ b/coreutils/pwd.c
@@ -1,12 +1,13 @@
#include "internal.h"
#include <stdio.h>
+#include <dirent.h>
const char pwd_usage[] = "Print the current directory.\n";
extern int
pwd_main(int argc, char * * argv)
{
- char buf[1024];
+ char buf[NAME_MAX];
if ( getcwd(buf, sizeof(buf)) == NULL ) {
perror("get working directory");
diff --git a/coreutils/sleep.c b/coreutils/sleep.c
index e48e14b2f..53fe5a0c2 100644
--- a/coreutils/sleep.c
+++ b/coreutils/sleep.c
@@ -1,15 +1,20 @@
#include "internal.h"
#include <stdio.h>
-const char sleep_usage[] = "sleep seconds\n"
-"\n"
-"\tPause program execution for the given number of seconds.\n";
+const char sleep_usage[] = " NUMBER\n"
+"Pause for NUMBER seconds.\n";
extern int
-sleep_main(struct FileInfo * i, int argc, char * * argv)
+sleep_main(int argc, char * * argv)
{
- if ( sleep(atoi(argv[1])) != 0 )
- return -1;
- else
- return 0;
+ if ( (argc < 2) || (**(argv+1) == '-') ) {
+ fprintf(stderr, "Usage: %s %s", *argv, sleep_usage);
+ exit(FALSE);
+ }
+
+ if ( sleep(atoi(*(++argv))) != 0 ) {
+ perror( "sleep");
+ exit (FALSE);
+ } else
+ exit (TRUE);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-29 20:14:40 +0000