diff options
Diffstat (limited to 'coreutils')
| -rw-r--r-- | coreutils/basename.c | 4 | ||||
| -rw-r--r-- | coreutils/cat.c | 4 | ||||
| -rw-r--r-- | coreutils/chgrp.c | 7 | ||||
| -rw-r--r-- | coreutils/chmod.c | 7 | ||||
| -rw-r--r-- | coreutils/chown.c | 7 | ||||
| -rw-r--r-- | coreutils/chroot.c | 7 | ||||
| -rw-r--r-- | coreutils/cmp.c | 4 | ||||
| -rw-r--r-- | coreutils/df.c | 12 | ||||
| -rw-r--r-- | coreutils/dirname.c | 4 | ||||
| -rw-r--r-- | coreutils/du.c | 15 | ||||
| -rw-r--r-- | coreutils/head.c | 5 | ||||
| -rw-r--r-- | coreutils/ln.c | 4 | ||||
| -rw-r--r-- | coreutils/ls.c | 116 | ||||
| -rw-r--r-- | coreutils/rmdir.c | 5 | ||||
| -rw-r--r-- | coreutils/sort.c | 14 | ||||
| -rw-r--r-- | coreutils/tail.c | 12 | ||||
| -rw-r--r-- | coreutils/tee.c | 3 | ||||
| -rw-r--r-- | coreutils/touch.c | 5 | ||||
| -rw-r--r-- | coreutils/tr.c | 10 | ||||
| -rw-r--r-- | coreutils/uniq.c | 5 | ||||
| -rw-r--r-- | coreutils/uuencode.c | 4 |
21 files changed, 121 insertions, 133 deletions
diff --git a/coreutils/basename.c b/coreutils/basename.c index c15afd5..bdbcec1 100644 --- a/coreutils/basename.c +++ b/coreutils/basename.c @@ -2,8 +2,8 @@ /* * Mini basename implementation for busybox * - * Copyright (C) 1999,2000,2001 by Lineo, inc. - * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org> + * Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen + * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/coreutils/cat.c b/coreutils/cat.c index aa8528d..820b634 100644 --- a/coreutils/cat.c +++ b/coreutils/cat.c @@ -2,8 +2,8 @@ /* * Mini Cat implementation for busybox * - * Copyright (C) 1999,2000,2001 by Lineo, inc. - * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org> + * Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen + * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/coreutils/chgrp.c b/coreutils/chgrp.c index fbc1036..43ffeb7 100644 --- a/coreutils/chgrp.c +++ b/coreutils/chgrp.c @@ -1,10 +1,9 @@ /* vi: set sw=4 ts=4: */ /* - * Mini chown/chmod/chgrp implementation for busybox + * Mini chgrp implementation for busybox * - * - * Copyright (C) 1999,2000,2001 by Lineo, inc. - * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org> + * Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen + * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/coreutils/chmod.c b/coreutils/chmod.c index 9139b3f..53230b5 100644 --- a/coreutils/chmod.c +++ b/coreutils/chmod.c @@ -1,10 +1,9 @@ /* vi: set sw=4 ts=4: */ /* - * Mini chown/chmod/chgrp implementation for busybox + * Mini chmod implementation for busybox * - * - * Copyright (C) 1999,2000,2001 by Lineo, inc. - * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org> + * Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen + * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/coreutils/chown.c b/coreutils/chown.c index d1e52de..c1b992c 100644 --- a/coreutils/chown.c +++ b/coreutils/chown.c @@ -1,10 +1,9 @@ /* vi: set sw=4 ts=4: */ /* - * Mini chown/chmod/chgrp implementation for busybox + * Mini chown implementation for busybox * - * - * Copyright (C) 1999,2000,2001 by Lineo, inc. - * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org> + * Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen + * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/coreutils/chroot.c b/coreutils/chroot.c index de6a2ea..ba3e5f8 100644 --- a/coreutils/chroot.c +++ b/coreutils/chroot.c @@ -2,9 +2,8 @@ /* * Mini chroot implementation for busybox * - * - * Copyright (C) 1999,2000,2001 by Lineo, inc. - * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org> + * Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen + * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -48,7 +47,7 @@ int chroot_main(int argc, char **argv) prog = *argv; execvp(*argv, argv); } else { -#if defined shell_main && defined BB_FEATURE_SH_STANDALONE_SHELL +#if defined shell_main && defined CONFIG_FEATURE_SH_STANDALONE_SHELL char shell[] = "/bin/sh"; char *shell_argv[2] = { shell, NULL }; applet_name = shell; diff --git a/coreutils/cmp.c b/coreutils/cmp.c index 6d57946..07bf3be 100644 --- a/coreutils/cmp.c +++ b/coreutils/cmp.c @@ -2,9 +2,7 @@ /* * Mini cmp implementation for busybox * - * - * Copyright (C) 1999,2000,2001 by Lineo, inc. - * Written by Matt Kraai <kraai@alumni.carnegiemellon.edu> + * Copyright (C) 2000,2001 by Matt Kraai <kraai@alumni.carnegiemellon.edu> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/coreutils/df.c b/coreutils/df.c index 8cb13fa..0e9e5d6 100644 --- a/coreutils/df.c +++ b/coreutils/df.c @@ -2,8 +2,8 @@ /* * Mini df implementation for busybox * - * Copyright (C) 1999,2000,2001 by Lineo, inc. - * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org> + * Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen + * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org> * based on original code by (I think) Bruce Perens <bruce@pixar.com>. * * This program is free software; you can redistribute it and/or modify @@ -31,7 +31,7 @@ #include "busybox.h" extern const char mtab_file[]; /* Defined in utility.c */ -#ifdef BB_FEATURE_HUMAN_READABLE +#ifdef CONFIG_FEATURE_HUMAN_READABLE static unsigned long df_disp_hr = KILOBYTE; #endif @@ -61,7 +61,7 @@ static int do_df(char *device, const char *mount_point) if(device==NULL) return FALSE; } -#ifdef BB_FEATURE_HUMAN_READABLE +#ifdef CONFIG_FEATURE_HUMAN_READABLE printf("%-20s %9s ", device, make_human_readable_str(s.f_blocks, s.f_bsize, df_disp_hr)); @@ -92,13 +92,13 @@ extern int df_main(int argc, char **argv) char disp_units_hdr[80] = "1k-blocks"; /* default display is kilobytes */ while ((opt = getopt(argc, argv, "k" -#ifdef BB_FEATURE_HUMAN_READABLE +#ifdef CONFIG_FEATURE_HUMAN_READABLE "hm" #endif )) > 0) { switch (opt) { -#ifdef BB_FEATURE_HUMAN_READABLE +#ifdef CONFIG_FEATURE_HUMAN_READABLE case 'h': df_disp_hr = 0; strcpy(disp_units_hdr, " Size"); diff --git a/coreutils/dirname.c b/coreutils/dirname.c index b534e69..3872337 100644 --- a/coreutils/dirname.c +++ b/coreutils/dirname.c @@ -2,8 +2,8 @@ /* * Mini dirname implementation for busybox * - * Copyright (C) 1999,2000,2001 by Lineo, inc. - * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org> + * Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen + * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/coreutils/du.c b/coreutils/du.c index fb649ae..c378837 100644 --- a/coreutils/du.c +++ b/coreutils/du.c @@ -2,9 +2,8 @@ /* * Mini du implementation for busybox * - * - * Copyright (C) 1999,2000,2001 by Lineo, inc. - * Written by John Beppu <beppu@lineo.com> + * Copyright (C) 1999,2000,2001 by Lineo, inc. and John Beppu + * Copyright (C) 1999,2000,2001 by John Beppu <beppu@codepoet.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -33,7 +32,7 @@ #include "busybox.h" -#ifdef BB_FEATURE_HUMAN_READABLE +#ifdef CONFIG_FEATURE_HUMAN_READABLE static unsigned long disp_hr = KILOBYTE; #endif @@ -46,7 +45,7 @@ static Display *print; static void print_normal(long size, char *filename) { -#ifdef BB_FEATURE_HUMAN_READABLE +#ifdef CONFIG_FEATURE_HUMAN_READABLE printf("%s\t%s\n", make_human_readable_str(size<<10, 1, disp_hr), filename); #else printf("%ld\t%s\n", size, filename); @@ -207,7 +206,7 @@ int du_main(int argc, char **argv) /* parse argv[] */ while ((c = getopt(argc, argv, "sl" -#ifdef BB_FEATURE_HUMAN_READABLE +#ifdef CONFIG_FEATURE_HUMAN_READABLE "hm" #endif "k")) != EOF) { @@ -218,7 +217,7 @@ int du_main(int argc, char **argv) case 'l': count_hardlinks = 1; break; -#ifdef BB_FEATURE_HUMAN_READABLE +#ifdef CONFIG_FEATURE_HUMAN_READABLE case 'h': disp_hr = 0; break; case 'm': disp_hr = MEGABYTE; break; #endif @@ -247,7 +246,7 @@ int du_main(int argc, char **argv) return status; } -/* $Id: du.c,v 1.50 2001/06/30 17:54:20 andersen Exp $ */ +/* $Id: du.c,v 1.51 2001/10/24 04:59:27 andersen Exp $ */ /* Local Variables: c-file-style: "linux" diff --git a/coreutils/head.c b/coreutils/head.c index 688c250..4a16771 100644 --- a/coreutils/head.c +++ b/coreutils/head.c @@ -2,9 +2,8 @@ /* * Mini head implementation for busybox * - * - * Copyright (C) 1999,2000,2001 by Lineo, inc. - * Written by John Beppu <beppu@lineo.com> + * Copyright (C) 1999 by Lineo, inc. and John Beppu + * Copyright (C) 1999,2000,2001 by John Beppu <beppu@codepoet.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/coreutils/ln.c b/coreutils/ln.c index 7412a86..213db9b 100644 --- a/coreutils/ln.c +++ b/coreutils/ln.c @@ -2,8 +2,8 @@ /* * Mini ln implementation for busybox * - * Copyright (C) 1999,2000,2001 by Lineo, inc. - * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org> + * Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen + * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/coreutils/ls.c b/coreutils/ls.c index 8d0282d..672a3bb 100644 --- a/coreutils/ls.c +++ b/coreutils/ls.c @@ -65,7 +65,7 @@ enum { #include <sys/ioctl.h> #include "busybox.h" -#ifdef BB_FEATURE_LS_TIMESTAMPS +#ifdef CONFIG_FEATURE_LS_TIMESTAMPS #include <time.h> #endif @@ -108,7 +108,7 @@ STYLE_COLUMNS = 3 /* fill columns */ #define DISP_RECURSIVE (1<<4) /* show directory and everything below it */ #define DISP_ROWS (1<<5) /* print across rows */ -#ifdef BB_FEATURE_LS_SORTFILES +#ifdef CONFIG_FEATURE_LS_SORTFILES /* how will the files be sorted */ static const int SORT_FORWARD = 0; /* sort in reverse order */ static const int SORT_REVERSE = 1; /* sort in reverse order */ @@ -122,7 +122,7 @@ static const int SORT_EXT = 8; /* sort by file name extension */ static const int SORT_DIR = 9; /* sort by file or directory */ #endif -#ifdef BB_FEATURE_LS_TIMESTAMPS +#ifdef CONFIG_FEATURE_LS_TIMESTAMPS /* which of the three times will be used */ static const int TIME_MOD = 0; static const int TIME_CHANGE = 1; @@ -142,7 +142,7 @@ static const int SPLIT_SUBDIR = 2; #define TYPEINDEX(mode) (((mode) >> 12) & 0x0f) #define TYPECHAR(mode) ("0pcCd?bB-?l?s???" [TYPEINDEX(mode)]) -#ifdef BB_FEATURE_LS_FILETYPES +#ifdef CONFIG_FEATURE_LS_FILETYPES #define APPCHAR(mode) ("\0|\0\0/\0\0\0\0\0@\0=\0\0\0" [TYPEINDEX(mode)]) #endif @@ -164,19 +164,19 @@ static int list_single(struct dnode *); static unsigned int disp_opts; static unsigned int style_fmt; static unsigned int list_fmt; -#ifdef BB_FEATURE_LS_SORTFILES +#ifdef CONFIG_FEATURE_LS_SORTFILES static unsigned int sort_opts; static unsigned int sort_order; #endif -#ifdef BB_FEATURE_LS_TIMESTAMPS +#ifdef CONFIG_FEATURE_LS_TIMESTAMPS static unsigned int time_fmt; #endif -#ifdef BB_FEATURE_LS_FOLLOWLINKS +#ifdef CONFIG_FEATURE_LS_FOLLOWLINKS static unsigned int follow_links=FALSE; #endif static unsigned short column = 0; -#ifdef BB_FEATURE_AUTOWIDTH +#ifdef CONFIG_FEATURE_AUTOWIDTH static unsigned short terminal_width = TERMINAL_WIDTH; static unsigned short column_width = COLUMN_WIDTH; static unsigned short tabstops = COLUMN_GAP; @@ -186,13 +186,13 @@ static unsigned short column_width = COLUMN_WIDTH; static int status = EXIT_SUCCESS; -#ifdef BB_FEATURE_HUMAN_READABLE +#ifdef CONFIG_FEATURE_HUMAN_READABLE static unsigned long ls_disp_hr = 0; #endif static int my_stat(struct dnode *cur) { -#ifdef BB_FEATURE_LS_FOLLOWLINKS +#ifdef CONFIG_FEATURE_LS_FOLLOWLINKS if (follow_links == TRUE) { if (stat(cur->fullname, &cur->dstat)) { perror_msg("%s", cur->fullname); @@ -222,7 +222,7 @@ static void newline(void) } /*----------------------------------------------------------------------*/ -#ifdef BB_FEATURE_LS_FILETYPES +#ifdef CONFIG_FEATURE_LS_FILETYPES static char append_char(mode_t mode) { if ( !(list_fmt & LIST_FILETYPE)) @@ -304,7 +304,7 @@ static struct dnode **dnalloc(int num) return(p); } -#ifdef BB_FEATURE_LS_RECURSIVE +#ifdef CONFIG_FEATURE_LS_RECURSIVE static void dfree(struct dnode **dnp) { struct dnode *cur, *next; @@ -361,7 +361,7 @@ static struct dnode **splitdnarray(struct dnode **dn, int nfiles, int which) } /*----------------------------------------------------------------------*/ -#ifdef BB_FEATURE_LS_SORTFILES +#ifdef CONFIG_FEATURE_LS_SORTFILES static int sortcmp(struct dnode *d1, struct dnode *d2) { int cmp, dif; @@ -426,13 +426,13 @@ static void shellsort(struct dnode **dn, int size) static void showfiles(struct dnode **dn, int nfiles) { int i, ncols, nrows, row, nc; -#ifdef BB_FEATURE_AUTOWIDTH +#ifdef CONFIG_FEATURE_AUTOWIDTH int len; #endif if(dn==NULL || nfiles < 1) return; -#ifdef BB_FEATURE_AUTOWIDTH +#ifdef CONFIG_FEATURE_AUTOWIDTH /* find the longest file name- use that as the column width */ column_width= 0; for (i=0; i<nfiles; i++) { @@ -488,7 +488,7 @@ static void showdirs(struct dnode **dn, int ndirs) { int i, nfiles; struct dnode **subdnp; -#ifdef BB_FEATURE_LS_RECURSIVE +#ifdef CONFIG_FEATURE_LS_RECURSIVE int dndirs; struct dnode **dnd; #endif @@ -503,17 +503,17 @@ static void showdirs(struct dnode **dn, int ndirs) nfiles= countfiles(subdnp); if (nfiles > 0) { /* list all files at this level */ -#ifdef BB_FEATURE_LS_SORTFILES +#ifdef CONFIG_FEATURE_LS_SORTFILES shellsort(subdnp, nfiles); #endif showfiles(subdnp, nfiles); -#ifdef BB_FEATURE_LS_RECURSIVE +#ifdef CONFIG_FEATURE_LS_RECURSIVE if (disp_opts & DISP_RECURSIVE) { /* recursive- list the sub-dirs */ dnd= splitdnarray(subdnp, nfiles, SPLIT_SUBDIR); dndirs= countsubdirs(subdnp, nfiles); if (dndirs > 0) { -#ifdef BB_FEATURE_LS_SORTFILES +#ifdef CONFIG_FEATURE_LS_SORTFILES shellsort(dnd, dndirs); #endif showdirs(dnd, dndirs); @@ -582,26 +582,26 @@ static int list_single(struct dnode *dn) { int i; char scratch[BUFSIZ + 1]; -#ifdef BB_FEATURE_LS_TIMESTAMPS +#ifdef CONFIG_FEATURE_LS_TIMESTAMPS char *filetime; time_t ttime, age; #endif -#if defined (BB_FEATURE_LS_FILETYPES) +#if defined (CONFIG_FEATURE_LS_FILETYPES) struct stat info; #endif -#ifdef BB_FEATURE_LS_FILETYPES +#ifdef CONFIG_FEATURE_LS_FILETYPES char append; #endif if (dn==NULL || dn->fullname==NULL) return(0); -#ifdef BB_FEATURE_LS_TIMESTAMPS +#ifdef CONFIG_FEATURE_LS_TIMESTAMPS ttime= dn->dstat.st_mtime; /* the default time */ if (time_fmt & TIME_ACCESS) ttime= dn->dstat.st_atime; if (time_fmt & TIME_CHANGE) ttime= dn->dstat.st_ctime; filetime= ctime(&ttime); #endif -#ifdef BB_FEATURE_LS_FILETYPES +#ifdef CONFIG_FEATURE_LS_FILETYPES append = append_char(dn->dstat.st_mode); #endif @@ -612,7 +612,7 @@ static int list_single(struct dnode *dn) column += 8; break; case LIST_BLOCKS: -#ifdef BB_FEATURE_HUMAN_READABLE +#ifdef CONFIG_FEATURE_HUMAN_READABLE fprintf(stdout, "%6s ", make_human_readable_str(dn->dstat.st_blocks>>1, KILOBYTE, (ls_disp_hr==TRUE)? 0: KILOBYTE)); #else @@ -633,7 +633,7 @@ static int list_single(struct dnode *dn) column += 10; break; case LIST_ID_NAME: -#ifdef BB_FEATURE_LS_USERNAME +#ifdef CONFIG_FEATURE_LS_USERNAME my_getpwuid(scratch, dn->dstat.st_uid); printf("%-8.8s ", scratch); my_getgrgid(scratch, dn->dstat.st_gid); @@ -650,7 +650,7 @@ static int list_single(struct dnode *dn) if (S_ISBLK(dn->dstat.st_mode) || S_ISCHR(dn->dstat.st_mode)) { printf("%4d, %3d ", (int)MAJOR(dn->dstat.st_rdev), (int)MINOR(dn->dstat.st_rdev)); } else { -#ifdef BB_FEATURE_HUMAN_READABLE +#ifdef CONFIG_FEATURE_HUMAN_READABLE if (ls_disp_hr==TRUE) { fprintf(stdout, "%8s ", make_human_readable_str(dn->dstat.st_size, 1, 0)); } else @@ -665,7 +665,7 @@ static int list_single(struct dnode *dn) } column += 10; break; -#ifdef BB_FEATURE_LS_TIMESTAMPS +#ifdef CONFIG_FEATURE_LS_TIMESTAMPS case LIST_FULLTIME: case LIST_DATE_TIME: if (list_fmt & LIST_FULLTIME) { @@ -693,7 +693,7 @@ static int list_single(struct dnode *dn) char *lpath = xreadlink(dn->fullname); if (lpath) { printf(" -> %s", lpath); -#ifdef BB_FEATURE_LS_FILETYPES +#ifdef CONFIG_FEATURE_LS_FILETYPES if (!stat(dn->fullname, &info)) { append = append_char(info.st_mode); } @@ -703,7 +703,7 @@ static int list_single(struct dnode *dn) } } break; -#ifdef BB_FEATURE_LS_FILETYPES +#ifdef CONFIG_FEATURE_LS_FILETYPES case LIST_FILETYPE: if (append != '\0') { printf("%1c", append); @@ -727,21 +727,21 @@ extern int ls_main(int argc, char **argv) int opt; int oi, ac; char **av; -#ifdef BB_FEATURE_AUTOWIDTH +#ifdef CONFIG_FEATURE_AUTOWIDTH struct winsize win = { 0, 0, 0, 0 }; #endif disp_opts= DISP_NORMAL; style_fmt= STYLE_AUTO; list_fmt= LIST_SHORT; -#ifdef BB_FEATURE_LS_SORTFILES +#ifdef CONFIG_FEATURE_LS_SORTFILES sort_opts= SORT_NAME; sort_order= SORT_FORWARD; #endif -#ifdef BB_FEATURE_LS_TIMESTAMPS +#ifdef CONFIG_FEATURE_LS_TIMESTAMPS time_fmt= TIME_MOD; #endif -#ifdef BB_FEATURE_AUTOWIDTH +#ifdef CONFIG_FEATURE_AUTOWIDTH ioctl(fileno(stdout), TIOCGWINSZ, &win); if (win.ws_row > 4) column_width = win.ws_row - 2; @@ -752,25 +752,25 @@ extern int ls_main(int argc, char **argv) /* process options */ while ((opt = getopt(argc, argv, "1AaCdgilnsx" -#ifdef BB_FEATURE_AUTOWIDTH +#ifdef CONFIG_FEATURE_AUTOWIDTH "T:w:" #endif -#ifdef BB_FEATURE_LS_FILETYPES +#ifdef CONFIG_FEATURE_LS_FILETYPES "Fp" #endif -#ifdef BB_FEATURE_LS_RECURSIVE +#ifdef CONFIG_FEATURE_LS_RECURSIVE "R" #endif -#ifdef BB_FEATURE_LS_SORTFILES +#ifdef CONFIG_FEATURE_LS_SORTFILES "rSvX" #endif -#ifdef BB_FEATURE_LS_TIMESTAMPS +#ifdef CONFIG_FEATURE_LS_TIMESTAMPS "cetu" #endif -#ifdef BB_FEATURE_LS_FOLLOWLINKS +#ifdef CONFIG_FEATURE_LS_FOLLOWLINKS "L" #endif -#ifdef BB_FEATURE_HUMAN_READABLE +#ifdef CONFIG_FEATURE_HUMAN_READABLE "h" #endif "k")) > 0) { @@ -785,54 +785,54 @@ extern int ls_main(int argc, char **argv) case 'l': style_fmt = STYLE_LONG; list_fmt |= LIST_LONG; -#ifdef BB_FEATURE_HUMAN_READABLE +#ifdef CONFIG_FEATURE_HUMAN_READABLE ls_disp_hr = FALSE; #endif break; case 'n': list_fmt |= LIST_ID_NUMERIC; break; case 's': list_fmt |= LIST_BLOCKS; break; case 'x': disp_opts = DISP_ROWS; break; -#ifdef BB_FEATURE_LS_FILETYPES +#ifdef CONFIG_FEATURE_LS_FILETYPES case 'F': list_fmt |= LIST_FILETYPE | LIST_EXEC; break; case 'p': list_fmt |= LIST_FILETYPE; break; #endif -#ifdef BB_FEATURE_LS_RECURSIVE +#ifdef CONFIG_FEATURE_LS_RECURSIVE case 'R': disp_opts |= DISP_RECURSIVE; break; #endif -#ifdef BB_FEATURE_LS_SORTFILES +#ifdef CONFIG_FEATURE_LS_SORTFILES case 'r': sort_order |= SORT_REVERSE; break; case 'S': sort_opts= SORT_SIZE; break; case 'v': sort_opts= SORT_VERSION; break; case 'X': sort_opts= SORT_EXT; break; #endif -#ifdef BB_FEATURE_LS_TIMESTAMPS +#ifdef CONFIG_FEATURE_LS_TIMESTAMPS case 'e': list_fmt |= LIST_FULLTIME; break; case 'c': time_fmt = TIME_CHANGE; -#ifdef BB_FEATURE_LS_SORTFILES +#ifdef CONFIG_FEATURE_LS_SORTFILES sort_opts= SORT_CTIME; #endif break; case 'u': time_fmt = TIME_ACCESS; -#ifdef BB_FEATURE_LS_SORTFILES +#ifdef CONFIG_FEATURE_LS_SORTFILES sort_opts= SORT_ATIME; #endif break; case 't': -#ifdef BB_FEATURE_LS_SORTFILES +#ifdef CONFIG_FEATURE_LS_SORTFILES sort_opts= SORT_MTIME; #endif break; #endif -#ifdef BB_FEATURE_LS_FOLLOWLINKS +#ifdef CONFIG_FEATURE_LS_FOLLOWLINKS case 'L': follow_links= TRUE; break; #endif -#ifdef BB_FEATURE_AUTOWIDTH +#ifdef CONFIG_FEATURE_AUTOWIDTH case 'T': tabstops= atoi(optarg); break; case 'w': terminal_width= atoi(optarg); break; #endif -#ifdef BB_FEATURE_HUMAN_READABLE +#ifdef CONFIG_FEATURE_HUMAN_READABLE case 'h': ls_disp_hr = TRUE; break; #endif case 'k': break; @@ -842,17 +842,17 @@ extern int ls_main(int argc, char **argv) } /* sort out which command line options take precedence */ -#ifdef BB_FEATURE_LS_RECURSIVE +#ifdef CONFIG_FEATURE_LS_RECURSIVE if (disp_opts & DISP_NOLIST) disp_opts &= ~DISP_RECURSIVE; /* no recurse if listing only dir */ #endif -#if defined (BB_FEATURE_LS_TIMESTAMPS) && defined (BB_FEATURE_LS_SORTFILES) +#if defined (CONFIG_FEATURE_LS_TIMESTAMPS) && defined (CONFIG_FEATURE_LS_SORTFILES) if (time_fmt & TIME_CHANGE) sort_opts= SORT_CTIME; if (time_fmt & TIME_ACCESS) sort_opts= SORT_ATIME; #endif if (style_fmt != STYLE_LONG) list_fmt &= ~LIST_ID_NUMERIC; /* numeric uid only for long list */ -#ifdef BB_FEATURE_LS_USERNAME +#ifdef CONFIG_FEATURE_LS_USERNAME if (style_fmt == STYLE_LONG && (list_fmt & LIST_ID_NUMERIC)) list_fmt &= ~LIST_ID_NAME; /* don't list names if numeric uid */ #endif @@ -908,7 +908,7 @@ extern int ls_main(int argc, char **argv) if (disp_opts & DISP_NOLIST) { -#ifdef BB_FEATURE_LS_SORTFILES +#ifdef CONFIG_FEATURE_LS_SORTFILES shellsort(dnp, nfiles); #endif if (nfiles > 0) showfiles(dnp, nfiles); @@ -918,13 +918,13 @@ extern int ls_main(int argc, char **argv) dndirs= countdirs(dnp, nfiles); dnfiles= nfiles - dndirs; if (dnfiles > 0) { -#ifdef BB_FEATURE_LS_SORTFILES +#ifdef CONFIG_FEATURE_LS_SORTFILES shellsort(dnf, dnfiles); #endif showfiles(dnf, dnfiles); } if (dndirs > 0) { -#ifdef BB_FEATURE_LS_SORTFILES +#ifdef CONFIG_FEATURE_LS_SORTFILES shellsort(dnd, dndirs); #endif showdirs(dnd, dndirs); diff --git a/coreutils/rmdir.c b/coreutils/rmdir.c index cac27ca..83b27c9 100644 --- a/coreutils/rmdir.c +++ b/coreutils/rmdir.c @@ -2,9 +2,8 @@ /* * Mini rmdir implementation for busybox * - * - * Copyright (C) 1999,2000,2001 by Lineo, inc. - * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org> + * Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen + * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/coreutils/sort.c b/coreutils/sort.c index 4f4979c..fc12dfb 100644 --- a/coreutils/sort.c +++ b/coreutils/sort.c @@ -43,10 +43,10 @@ int sort_main(int argc, char **argv) char *line, **lines = NULL; int i, opt, nlines = 0; int (*compare)(const void *, const void *) = compare_ascii; -#ifdef BB_FEATURE_SORT_REVERSE +#ifdef CONFIG_FEATURE_SORT_REVERSE int reverse = FALSE; #endif -#ifdef BB_FEATURE_SORT_UNIQUE +#ifdef CONFIG_FEATURE_SORT_UNIQUE int unique = FALSE; #endif @@ -55,12 +55,12 @@ int sort_main(int argc, char **argv) case 'n': compare = compare_numeric; break; -#ifdef BB_FEATURE_SORT_REVERSE +#ifdef CONFIG_FEATURE_SORT_REVERSE case 'r': reverse = TRUE; break; #endif -#ifdef BB_FEATURE_SORT_UNIQUE +#ifdef CONFIG_FEATURE_SORT_UNIQUE case 'u': unique = TRUE; break; @@ -88,17 +88,17 @@ int sort_main(int argc, char **argv) qsort(lines, nlines, sizeof(char *), compare); /* print it */ -#ifdef BB_FEATURE_SORT_REVERSE +#ifdef CONFIG_FEATURE_SORT_REVERSE if (reverse) { for (i = --nlines; 0 <= i; i--) -#ifdef BB_FEATURE_SORT_UNIQUE +#ifdef CONFIG_FEATURE_SORT_UNIQUE if((!unique) || (i == nlines) || (strcmp(lines[i + 1], lines[i]))) #endif puts(lines[i]); } else #endif for (i = 0; i < nlines; i++) -#ifdef BB_FEATURE_SORT_UNIQUE +#ifdef CONFIG_FEATURE_SORT_UNIQUE if((!unique) || (!i) || (strcmp(lines[i - 1], lines[i]))) #endif puts(lines[i]); diff --git a/coreutils/tail.c b/coreutils/tail.c index 5e5fbc1..0c8dec2 100644 --- a/coreutils/tail.c +++ b/coreutils/tail.c @@ -73,7 +73,7 @@ int tail_main(int argc, char **argv) case 'f': follow = 1; break; -#ifdef BB_FEATURE_FANCY_TAIL +#ifdef CONFIG_FEATURE_FANCY_TAIL case 'c': units = BYTES; /* FALLS THROUGH */ @@ -85,7 +85,7 @@ int tail_main(int argc, char **argv) if (optarg[0] == '+') from_top = 1; break; -#ifdef BB_FEATURE_FANCY_TAIL +#ifdef CONFIG_FEATURE_FANCY_TAIL case 'q': hide_headers = 1; break; @@ -118,7 +118,7 @@ int tail_main(int argc, char **argv) } } -#ifdef BB_FEATURE_FANCY_TAIL +#ifdef CONFIG_FEATURE_FANCY_TAIL /* tail the files */ if (!from_top && units == BYTES) tailbuf = xmalloc(count); @@ -136,7 +136,7 @@ int tail_main(int argc, char **argv) printf("%s==> %s <==\n", i == 0 ? "" : "\n", argv[optind + i]); while ((nread = safe_read(fds[i], buf, sizeof(buf))) > 0) { if (from_top) { -#ifdef BB_FEATURE_FANCY_TAIL +#ifdef CONFIG_FEATURE_FANCY_TAIL if (units == BYTES) { if (count - 1 <= seen) nwrite = nread; @@ -169,7 +169,7 @@ int tail_main(int argc, char **argv) break; } } else { -#ifdef BB_FEATURE_FANCY_TAIL +#ifdef CONFIG_FEATURE_FANCY_TAIL if (units == BYTES) { if (nread < count) { memmove(tailbuf, tailbuf + nread, count - nread); @@ -203,7 +203,7 @@ int tail_main(int argc, char **argv) status = EXIT_FAILURE; } -#ifdef BB_FEATURE_FANCY_TAIL +#ifdef CONFIG_FEATURE_FANCY_TAIL if (!from_top && units == BYTES) { if (count < seen) seen = count; diff --git a/coreutils/tee.c b/coreutils/tee.c index 64a0922..1c14542 100644 --- a/coreutils/tee.c +++ b/coreutils/tee.c @@ -2,8 +2,7 @@ /* * Mini tee implementation for busybox * - * Copyright (C) 1999,2000,2001 by Lineo, inc. - * Written by Matt Kraai <kraai@alumni.carnegiemellon.edu> + * Copyright (C) 2000,2001 by Matt Kraai <kraai@alumni.carnegiemellon.edu> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/coreutils/touch.c b/coreutils/touch.c index 1718da7..2673495 100644 --- a/coreutils/touch.c +++ b/coreutils/touch.c @@ -2,9 +2,8 @@ /* * Mini touch implementation for busybox * - * - * Copyright (C) 1999,2000,2001 by Lineo, inc. - * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org> + * Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen + * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/coreutils/tr.c b/coreutils/tr.c index 5b7b8d0..2665d92 100644 --- a/coreutils/tr.c +++ b/coreutils/tr.c @@ -155,11 +155,11 @@ extern int tr_main(int argc, char **argv) int output_length=0, input_length; int idx = 1; int i; - RESERVE_BB_BUFFER(output, BUFSIZ); - RESERVE_BB_BUFFER(input, BUFSIZ); - RESERVE_BB_UBUFFER(vector, ASCII+1); - RESERVE_BB_BUFFER(invec, ASCII+1); - RESERVE_BB_BUFFER(outvec, ASCII+1); + RESERVE_CONFIG_BUFFER(output, BUFSIZ); + RESERVE_CONFIG_BUFFER(input, BUFSIZ); + RESERVE_CONFIG_UBUFFER(vector, ASCII+1); + RESERVE_CONFIG_BUFFER(invec, ASCII+1); + RESERVE_CONFIG_BUFFER(outvec, ASCII+1); /* ... but make them available globally */ poutput = output; diff --git a/coreutils/uniq.c b/coreutils/uniq.c index 53e3c64..cb63c42 100644 --- a/coreutils/uniq.c +++ b/coreutils/uniq.c @@ -2,9 +2,8 @@ /* * Mini uniq implementation for busybox * - * - * Copyright (C) 1999,2000,2001 by Lineo, inc. - * Written by John Beppu <beppu@lineo.com> + * Copyright (C) 1999 by Lineo, inc. and John Beppu + * Copyright (C) 1999,2000,2001 by John Beppu <beppu@codepoet.org> * Rewritten by Matt Kraai <kraai@alumni.carnegiemellon.edu> * * This program is free software; you can redistribute it and/or modify diff --git a/coreutils/uuencode.c b/coreutils/uuencode.c index fc03740..0a362a2 100644 --- a/coreutils/uuencode.c +++ b/coreutils/uuencode.c @@ -84,8 +84,8 @@ int uuencode_main(int argc, char **argv) { const int src_buf_size = 60; // This *MUST* be a multiple of 3 const int dst_buf_size = 4 * ((src_buf_size + 2) / 3); - RESERVE_BB_BUFFER(src_buf, src_buf_size + 1); - RESERVE_BB_BUFFER(dst_buf, dst_buf_size + 1); + RESERVE_CONFIG_BUFFER(src_buf, src_buf_size + 1); + RESERVE_CONFIG_BUFFER(dst_buf, dst_buf_size + 1); struct stat stat_buf; FILE *src_stream = stdin; char *tbl = tbl_std; |