Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-06-06 17:29:42 +00:00
Code Issues Projects Releases Wiki Activity

more stuff

Browse Source
This commit is contained in:
Eric Andersen 1999-10-07 08:30:23 +00:00
parent 5c3199e0a5
commit 596e5469d0
15 changed files with 1033 additions and 1142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -23,7 +23,7 @@ BINDIR=$(prefix)
LDFLAGS= -s
LIBRARIES=-lc
OBJECTS=$(shell ./busybox.sh) utility.o
OBJECTS=$(shell ./busybox.sh)
CFLAGS+= -DBB_VER='"$(VERSION)"'
CFLAGS+= -DBB_BT='"$(BUILDTIME)"'

8
applets/busybox.c
View File

@ -111,7 +111,7 @@ static const struct Applet applets[] = {
{"mt", mt_main},
#endif
#ifdef BB_MV //bin
{"mv", dyadic_main},
{"mv", mv_main},
#endif
#ifdef BB_PRINTF //usr/bin
{"printf", printf_main},
@ -144,7 +144,7 @@ static const struct Applet applets[] = {
{"sync", sync_main},
#endif
#ifdef BB_TOUCH //usr/bin
{"touch", monadic_main},
{"touch", touch_main},
#endif
#ifdef BB_TRUE //bin
{"true", true_main},
@ -208,8 +208,8 @@ int busybox_main(int argc, char **argv)
const struct Applet *a = applets;
fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n",
BB_VER, BB_BT);
fprintf(stderr, "Usage: busybox [function] [arguments]...\n");
fprintf(stderr, "or\nUsage: [function] [arguments]...\n");
fprintf(stderr, "\nUsage:\t[function] [arguments]...\n");
fprintf(stderr, "\tbusybox [function] [arguments]...\n");
fprintf(stderr,
"\n\tMost people will create a symlink to busybox for each\n"
"\tfunction name, and busybox will act like whatever you invoke it as.\n");

8
busybox.c
View File

@ -111,7 +111,7 @@ static const struct Applet applets[] = {
{"mt", mt_main},
#endif
#ifdef BB_MV //bin
{"mv", dyadic_main},
{"mv", mv_main},
#endif
#ifdef BB_PRINTF //usr/bin
{"printf", printf_main},
@ -144,7 +144,7 @@ static const struct Applet applets[] = {
{"sync", sync_main},
#endif
#ifdef BB_TOUCH //usr/bin
{"touch", monadic_main},
{"touch", touch_main},
#endif
#ifdef BB_TRUE //bin
{"true", true_main},
@ -208,8 +208,8 @@ int busybox_main(int argc, char **argv)
const struct Applet *a = applets;
fprintf(stderr, "BusyBox v%s (%s) multi-call binary -- GPL2\n",
BB_VER, BB_BT);
fprintf(stderr, "Usage: busybox [function] [arguments]...\n");
fprintf(stderr, "or\nUsage: [function] [arguments]...\n");
fprintf(stderr, "\nUsage:\t[function] [arguments]...\n");
fprintf(stderr, "\tbusybox [function] [arguments]...\n");
fprintf(stderr,
"\n\tMost people will create a symlink to busybox for each\n"
"\tfunction name, and busybox will act like whatever you invoke it as.\n");

9
busybox.def.h
View File

@ -30,7 +30,6 @@
//#define BB_LOADKMAP
////#define BB_LOSETUP
#define BB_LS
//#define BB_MAIN
//#define BB_MAKEDEVS
////#define BB_MATH
//#define BB_MKDIR
@ -39,9 +38,9 @@
//#define BB_MNC
//#define BB_MONADIC
#define BB_MORE
//#define BB_MOUNT
#define BB_MOUNT
////#define BB_MT
//#define BB_MV
#define BB_MV
//#define BB_POSTPROCESS
//#define BB_PRINTF
//#define BB_PWD
@ -53,10 +52,10 @@
//#define BB_SWAPON
//#define BB_SYNC
#define BB_TAR
//#define BB_TOUCH
#define BB_TOUCH
#define BB_TRUE
//#define BB_UMOUNT
//#define BB_UPDATE
//#define BB_UTILITY
#define BB_UTILITY
#define BB_ZCAT
#define BB_GZIP

7
coreutils/df.c
View File

@ -3,6 +3,7 @@
#include <mntent.h>
#include <sys/stat.h>
#include <sys/vfs.h>
#include <fstab.h>
const char df_usage[] = "df [filesystem ...]\n"
"\n"
@ -10,7 +11,7 @@ const char df_usage[] = "df [filesystem ...]\n"
static int
df(const char * device, const char * mountPoint)
df(char* device, const char * mountPoint)
{
struct statfs s;
long blocks_used;
@ -25,6 +26,8 @@ df(const char * device, const char * mountPoint)
blocks_used = s.f_blocks - s.f_bfree;
blocks_percent_used = (long)
(blocks_used * 100.0 / (blocks_used + s.f_bavail) + 0.5);
if ( strcmp(device, "/dev/root")==0)
device=(getfsfile ("/"))->fs_spec;
printf(
"%-20s %9ld %9ld %9ld %3ld%% %s\n",
@ -129,3 +132,5 @@ findMountPoint(const char* name, const char* table)
endmntent(mountTable);
return mountEntry;
}

100
coreutils/mv.c
View File

@ -1,38 +1,84 @@
/*
* Mini mv implementation for busybox
*
* Copyright (C) 1998 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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
#include "internal.h"
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <utime.h>
#include <errno.h>
const char mv_usage[] = "mv source-file destination-file\n"
"\t\tmv source-file [source-file ...] destination-directory\n"
"\n"
"\tMove the source files to the destination.\n"
"\n";
const char mv_usage[] = "source-file [source-file ...] destination-file\n"
"\n" "\tMove the source files to the destination.\n" "\n";
extern int
mv_fn(const struct FileInfo * i)
extern int mv_main (int argc, char **argv)
{
struct stat destination_stat;
char d[1024];
struct FileInfo n;
const char *srcName;
const char *destName;
const char *lastArg;
BOOL dirFlag;
if ( stat(i->destination, &destination_stat) == 0 ) {
if ( i->stat.st_ino == destination_stat.st_ino
&& i->stat.st_dev == destination_stat.st_dev )
return 0; /* Move file to itself. */
if (argc < 3) {
fprintf (stderr, "Usage: %s %s", *argv, mv_usage);
return (FALSE);
}
if ( (destination_stat.st_mode & S_IFMT) == S_IFDIR ) {
n = *i;
n.destination = join_paths(d, i->destination, basename(i->source));
i = &n;
lastArg = argv[argc - 1];
dirFlag = isDirectory (lastArg);
if ((argc > 3) && !dirFlag) {
fprintf (stderr, "%s: not a directory\n", lastArg);
return (FALSE);
}
if ( rename(i->source, i->destination) == 0 )
return 0;
else if ( errno == EXDEV && is_a_directory(i->source) ) {
fprintf(stderr
,"%s: Can't move directory across filesystems.\n"
,i->source);
return 1;
while (argc-- > 2) {
srcName = *(++argv);
if (access (srcName, 0) < 0) {
perror (srcName);
continue;
}
else
return cp_fn(i);
destName = lastArg;
if (dirFlag)
destName = buildName (destName, srcName);
if (rename (srcName, destName) >= 0)
continue;
if (errno != EXDEV) {
perror (destName);
continue;
}
if (!copyFile (srcName, destName, TRUE))
continue;
if (unlink (srcName) < 0)
perror (srcName);
}
return (TRUE);
}

89
coreutils/touch.c
View File

@ -1,20 +1,85 @@
#include "internal.h"
#include <sys/types.h>
#include <stdio.h>
#include <utime.h>
/*
* Mini touch implementation for busybox
*
* Copyright (C) 1998 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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
const char touch_usage[] = "touch [-c] file [file ...]\n"
"\n"
#include "internal.h"
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <utime.h>
#include <errno.h>
const char touch_usage[] = "touch [-c] file [file ...]\n\n"
"\tUpdate the last-modified date on the given file[s].\n";
extern int
touch_fn(const struct FileInfo * i)
touch_main(int argc, char **argv)
{
if ( (utime(i->source, 0) != 0) && (i->create != 1) ) {
if ( fopen(i->source, "w") == NULL ) {
name_and_error(i->source);
return 1;
int fd;
int create=TRUE;
if (argc < 2) {
fprintf(stderr, "Usage: %s %s", *argv, touch_usage);
exit( FALSE);
}
argc--;
argv++;
/* Parse options */
while (**argv == '-') {
while (*++(*argv)) switch (**argv) {
case 'c':
create = FALSE;
break;
default:
fprintf(stderr, "Unknown option: %c\n", **argv);
exit( FALSE);
}
argc--;
argv++;
}
fd = open (*argv, (create==FALSE)? O_RDWR : O_RDWR | O_CREAT, 0644);
if (fd < 0 ) {
if (create==FALSE && errno == ENOENT)
exit( TRUE);
else {
perror("touch");
exit( FALSE);
}
}
return 0;
close( fd);
if (utime (*argv, NULL)) {
perror("touch");
exit( FALSE);
}
else
exit( TRUE);
}

7
df.c
View File

@ -3,6 +3,7 @@
#include <mntent.h>
#include <sys/stat.h>
#include <sys/vfs.h>
#include <fstab.h>
const char df_usage[] = "df [filesystem ...]\n"
"\n"
@ -10,7 +11,7 @@ const char df_usage[] = "df [filesystem ...]\n"
static int
df(const char * device, const char * mountPoint)
df(char* device, const char * mountPoint)
{
struct statfs s;
long blocks_used;
@ -25,6 +26,8 @@ df(const char * device, const char * mountPoint)
blocks_used = s.f_blocks - s.f_bfree;
blocks_percent_used = (long)
(blocks_used * 100.0 / (blocks_used + s.f_bavail) + 0.5);
if ( strcmp(device, "/dev/root")==0)
device=(getfsfile ("/"))->fs_spec;
printf(
"%-20s %9ld %9ld %9ld %3ld%% %s\n",
@ -129,3 +132,5 @@ findMountPoint(const char* name, const char* table)
endmntent(mountTable);
return mountEntry;
}

47
findutils/grep.c
View File

@ -31,12 +31,10 @@ const char grep_usage[] =
static BOOL search
(const char * string, const char * word, BOOL ignoreCase);
static BOOL search (const char *string, const char *word, BOOL ignoreCase);
extern int
grep_main(int argc, char ** argv)
extern int grep_main (int argc, char **argv)
{
FILE *fp;
const char *word;
@ -53,19 +51,17 @@ grep_main(int argc, char ** argv)
argc--;
argv++;
if (argc < 1)
{
if (argc < 1) {
fprintf (stderr, "%s", grep_usage);
return 1;
}
if (**argv == '-')
{
if (**argv == '-') {
argc--;
cp = *argv++;
while (*++cp) switch (*cp)
{
while (*++cp)
switch (*cp) {
case 'i':
ignoreCase = TRUE;
break;
@ -85,14 +81,12 @@ grep_main(int argc, char ** argv)
tellName = (argc > 1);
while (argc-- > 0)
{
while (argc-- > 0) {
name = *argv++;
fp = fopen (name, "r");
if (fp == NULL)
{
if (fp == NULL) {
perror (name);
continue;
@ -100,8 +94,7 @@ grep_main(int argc, char ** argv)
line = 0;
while (fgets(buf, sizeof(buf), fp))
{
while (fgets (buf, sizeof (buf), fp)) {
line++;
cp = &buf[strlen (buf) - 1];
@ -109,8 +102,7 @@ grep_main(int argc, char ** argv)
if (*cp != '\n')
fprintf (stderr, "%s: Line too long\n", name);
if (search(buf, word, ignoreCase))
{
if (search (buf, word, ignoreCase)) {
if (tellName)
printf ("%s: ", name);
@ -133,8 +125,7 @@ grep_main(int argc, char ** argv)
/*
* See if the specified word is found in the specified string.
*/
static BOOL
search(const char * string, const char * word, BOOL ignoreCase)
static BOOL search (const char *string, const char *word, BOOL ignoreCase)
{
const char *cp1;
const char *cp2;
@ -145,10 +136,8 @@ search(const char * string, const char * word, BOOL ignoreCase)
len = strlen (word);
if (!ignoreCase)
{
while (TRUE)
{
if (!ignoreCase) {
while (TRUE) {
string = strchr (string, word[0]);
if (string == NULL)
@ -170,11 +159,9 @@ search(const char * string, const char * word, BOOL ignoreCase)
if (isupper (lowFirst))
lowFirst = tolower (lowFirst);
while (TRUE)
{
while (TRUE) {
while (*string && (*string != lowFirst) &&
(!isupper(*string) || (tolower(*string) != lowFirst)))
{
(!isupper (*string) || (tolower (*string) != lowFirst))) {
string++;
}
@ -184,8 +171,7 @@ search(const char * string, const char * word, BOOL ignoreCase)
cp1 = string;
cp2 = word;
do
{
do {
if (*cp2 == '\0')
return TRUE;
@ -204,6 +190,7 @@ search(const char * string, const char * word, BOOL ignoreCase)
string++;
}
return (TRUE);
}
#endif

47
grep.c
View File

@ -31,12 +31,10 @@ const char grep_usage[] =
static BOOL search
(const char * string, const char * word, BOOL ignoreCase);
static BOOL search (const char *string, const char *word, BOOL ignoreCase);
extern int
grep_main(int argc, char ** argv)
extern int grep_main (int argc, char **argv)
{
FILE *fp;
const char *word;
@ -53,19 +51,17 @@ grep_main(int argc, char ** argv)
argc--;
argv++;
if (argc < 1)
{
if (argc < 1) {
fprintf (stderr, "%s", grep_usage);
return 1;
}
if (**argv == '-')
{
if (**argv == '-') {
argc--;
cp = *argv++;
while (*++cp) switch (*cp)
{
while (*++cp)
switch (*cp) {
case 'i':
ignoreCase = TRUE;
break;
@ -85,14 +81,12 @@ grep_main(int argc, char ** argv)
tellName = (argc > 1);
while (argc-- > 0)
{
while (argc-- > 0) {
name = *argv++;
fp = fopen (name, "r");
if (fp == NULL)
{
if (fp == NULL) {
perror (name);
continue;
@ -100,8 +94,7 @@ grep_main(int argc, char ** argv)
line = 0;
while (fgets(buf, sizeof(buf), fp))
{
while (fgets (buf, sizeof (buf), fp)) {
line++;
cp = &buf[strlen (buf) - 1];
@ -109,8 +102,7 @@ grep_main(int argc, char ** argv)
if (*cp != '\n')
fprintf (stderr, "%s: Line too long\n", name);
if (search(buf, word, ignoreCase))
{
if (search (buf, word, ignoreCase)) {
if (tellName)
printf ("%s: ", name);
@ -133,8 +125,7 @@ grep_main(int argc, char ** argv)
/*
* See if the specified word is found in the specified string.
*/
static BOOL
search(const char * string, const char * word, BOOL ignoreCase)
static BOOL search (const char *string, const char *word, BOOL ignoreCase)
{
const char *cp1;
const char *cp2;
@ -145,10 +136,8 @@ search(const char * string, const char * word, BOOL ignoreCase)
len = strlen (word);
if (!ignoreCase)
{
while (TRUE)
{
if (!ignoreCase) {
while (TRUE) {
string = strchr (string, word[0]);
if (string == NULL)
@ -170,11 +159,9 @@ search(const char * string, const char * word, BOOL ignoreCase)
if (isupper (lowFirst))
lowFirst = tolower (lowFirst);
while (TRUE)
{
while (TRUE) {
while (*string && (*string != lowFirst) &&
(!isupper(*string) || (tolower(*string) != lowFirst)))
{
(!isupper (*string) || (tolower (*string) != lowFirst))) {
string++;
}
@ -184,8 +171,7 @@ search(const char * string, const char * word, BOOL ignoreCase)
cp1 = string;
cp2 = word;
do
{
do {
if (*cp2 == '\0')
return TRUE;
@ -204,6 +190,7 @@ search(const char * string, const char * word, BOOL ignoreCase)
string++;
}
return (TRUE);
}
#endif

2
internal.h
View File

@ -127,6 +127,7 @@ extern int mnc_main(int argc, char** argv);
extern int monadic_main(int argc, char** argv);
extern int mount_main(int argc, char** argv);
extern int mt_main(int argc, char** argv);
extern int mv_main(int argc, char** argv);
extern int printf_main(int argc, char** argv);
extern int pwd_main(int argc, char** argv);
extern int reboot_main(int argc, char** argv);
@ -135,6 +136,7 @@ extern int scan_partitions_main(int argc, char** argv);
extern int sh_main(int argc, char** argv);
extern int sleep_main(int argc, char** argv);
extern int tar_main(int argc, char** argv);
extern int touch_main(int argc, char** argv);
extern int sync_main(int argc, char** argv);
extern int tput_main(int argc, char** argv);
extern int true_main(int argc, char** argv);

370
mount.c
View File

@ -1,9 +1,29 @@
/*
3/21/1999 Charles P. Wright <cpwright@cpwright.com>
searches through fstab when -a is passed
will try mounting stuff with all fses when passed -t auto
1999-04-17 Dave Cinege...Rewrote -t auto. Fixed ro mtab.
* Mini mount implementation for busybox
*
* Copyright (C) 1999 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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* 3/21/1999 Charles P. Wright <cpwright@cpwright.com>
* searches through fstab when -a is passed
* will try mounting stuff with all fses when passed -t auto
*
* 1999-04-17 Dave Cinege...Rewrote -t auto. Fixed ro mtab.
* 1999-10-07 Erik Andersen. Removed mtab usage, major adjustments,
* and some serious dieting all around.
*/
#include "internal.h"
@ -15,14 +35,13 @@
#include <mntent.h>
#include <sys/mount.h>
#include <ctype.h>
#include <fstab.h>
const char mount_usage[] = "mount\n"
"\t\tmount [flags] special-device directory\n"
const char mount_usage[] = "Usage:\tmount [flags]\n"
"\tmount [flags] device directory [-o options,more-options]\n"
"\n"
"Flags:\n"
"\t-a:\tMount all file systems in fstab.\n"
"\t-f:\t\"Fake\" mount. Add entry to mount table but don't mount it.\n"
"\t-n:\tDon't write a mount table entry.\n"
"\t-o option:\tOne of many filesystem options, listed below.\n"
"\t-r:\tMount the filesystem read-only.\n"
"\t-t filesystem-type:\tSpecify the filesystem type.\n"
@ -61,32 +80,21 @@ static const struct mount_options mount_options[] = {
{0, 0, 0}
};
static void
show_flags(unsigned long flags, char * buffer)
{
const struct mount_options * f = mount_options;
while ( f->name ) {
if ( flags & f->and ) {
int length = strlen(f->name);
memcpy(buffer, f->name, length);
buffer += length;
*buffer++ = ',';
*buffer = '\0';
}
f++;
}
}
static void
one_option(
char * option
,unsigned long * flags
,char * data)
parse_mount_options ( char *options, unsigned long *flags, char *data)
{
printf("option=%s\n", options);
while (*options) {
char *comma = strchr (options, ',');
const struct mount_options* f = mount_options;
if (comma)
*comma = '\0';
printf("checking option=%s vs %s\n", options, f->name);
while (f->name != 0) {
if ( strcasecmp(f->name, option) == 0 ) {
printf("checking option=%s vs %s\n", options, f->name);
if (strcasecmp (f->name, options) == 0) {
*flags &= f->and;
*flags |= f->or;
return;
@ -97,56 +105,37 @@ one_option(
data += strlen (data);
*data++ = ',';
}
strcpy(data, option);
}
static void
parse_mount_options(
char * options
,unsigned long * flags
,char * data)
{
while ( *options ) {
char * comma = strchr(options, ',');
if ( comma )
*comma = '\0';
one_option(options, flags, data);
strcpy (data, options);
if (comma) {
*comma = ',';
options = ++comma;
}
else
} else
break;
}
}
int
mount_one (
char * blockDevice
,char * directory
,char * filesystemType
,unsigned long flags
,char * string_flags
,int noMtab
,int fake)
char *blockDevice, char *directory, char *filesystemType,
unsigned long flags, char *string_flags)
{
int error = 0;
int status = 0;
char buf[255];
if (!fake) {
if (*filesystemType == 'a') { //Will fail on real FS starting with 'a'
if (strcmp(filesystemType, "auto") == 0) {
FILE *f = fopen ("/proc/filesystems", "r");
if (f == NULL) return 1;
if (f == NULL)
return( FALSE);
while (fgets (buf, sizeof (buf), f) != NULL) {
filesystemType = buf;
if (*filesystemType == '\t') { // Not a nodev filesystem
while (*filesystemType && *filesystemType != '\n') filesystemType++;
// Add NULL termination to each line
while (*filesystemType && *filesystemType != '\n')
filesystemType++;
*filesystemType = '\0';
filesystemType = buf;
@ -154,216 +143,59 @@ mount_one(
status = mount (blockDevice, directory, filesystemType,
flags | MS_MGC_VAL, string_flags);
error = errno;
if (status == 0) break;
if (status == 0)
break;
}
}
fclose (f);
} else {
status = mount (blockDevice, directory, filesystemType,
flags | MS_MGC_VAL, string_flags);
error = errno;
}
}
if ( status == 0 ) {
char * s = &string_flags[strlen(string_flags)];
FILE * mountTable;
if ( s != string_flags ) {
*s++ = ',';
show_flags(flags, s);
if (status) {
fprintf (stderr, "Mounting %s on %s failed: %s\n",
blockDevice, directory, strerror(errno));
return (FALSE);
}
if ( !noMtab && (mountTable = setmntent("/etc/mtab", "a+")) ) {
int length = strlen(directory);
struct mntent m;
if ( length > 1 && directory[length - 1] == '/' )
directory[length - 1] = '\0';
if ( filesystemType == 0 ) {
struct mntent * p
= findMountPoint(blockDevice, "/proc/mounts");
if ( p && p->mnt_type )
filesystemType = p->mnt_type;
}
m.mnt_fsname = blockDevice;
m.mnt_dir = directory;
m.mnt_type = filesystemType ? filesystemType : "default";
if (*string_flags) {
m.mnt_opts = string_flags;
} else {
if ( (flags | MS_RDONLY) == flags )
m.mnt_opts = "ro";
else
m.mnt_opts = "rw";
return (TRUE);
}
m.mnt_freq = 0;
m.mnt_passno = 0;
addmntent(mountTable, &m);
endmntent(mountTable);
}
return 0;
} else {
fprintf(stderr, "Mount %s", blockDevice);
if ( filesystemType && *filesystemType )
fprintf(stderr, " (type %s)", filesystemType);
fprintf(
stderr
," on %s: "
,directory);
switch ( error ) {
case EPERM:
if (geteuid() == 0)
fprintf(
stderr
,"mount point %s is not a directory"
,blockDevice);
else
fprintf(
stderr
,"must be superuser to use mount");
break;
case EBUSY:
fprintf(
stderr
,"%s already mounted or %s busy"
,blockDevice
,directory);
break;
case ENOENT:
extern int mount_main (int argc, char **argv)
{
struct stat statbuf;
if ( stat(directory, &statbuf) != 0 )
fprintf(
stderr
,"directory %s does not exist"
,directory);
else if ( stat(blockDevice, &statbuf) != 0 )
fprintf(
stderr
,"block device %s does not exist"
,blockDevice);
else
fprintf(
stderr
,"%s is not mounted on %s, but the mount table says it is."
,blockDevice
,directory);
break;
}
case ENOTDIR:
fprintf(
stderr
,"%s is not a directory"
,directory);
break;
case EINVAL:
fprintf(
stderr
,"wrong filesystem type, or bad superblock on %s"
,blockDevice);
break;
case EMFILE:
fprintf(stderr, "mount table full");
break;
case EIO:
fprintf(
stderr
,"I/O error reading %s"
,blockDevice);
break;
case ENODEV:
{
FILE * f = fopen("/proc/filesystems", "r");
fprintf(
stderr
,"filesystem type %s not in kernel.\n"
,filesystemType);
fprintf(stderr, "Do you need to load a module?\n");
if ( f ) {
char buf[100];
fprintf(
stderr
,"Here are the filesystem types the kernel"
" can mount:\n");
while ( fgets(buf, sizeof(buf), f) != 0 )
fprintf(stderr, "\t%s", buf);
fclose(f);
}
break;
}
case ENOTBLK:
fprintf(
stderr
,"%s is not a block device"
,blockDevice);
break;
case ENXIO:
fprintf(
stderr
,"%s is not a valid block device"
,blockDevice);
break;
default:
fputs(strerror(errno), stderr);
}
putc('\n', stderr);
return -1;
}
}
extern int
mount_main(struct FileInfo * i, int argc, char * * argv)
{
char string_flags[1024];
char string_flags[1024]="\0";
unsigned long flags = 0;
char *filesystemType = "auto";
int fake = 0;
int noMtab = 0;
int all = 0;
*string_flags = '\0';
int i = argc;
if (argc == 1) {
FILE *mountTable;
if ( (mountTable = setmntent("/etc/mtab", "r")) ) {
if ((mountTable = setmntent ("/proc/mounts", "r"))) {
struct mntent *m;
while ((m = getmntent (mountTable)) != 0) {
printf(
"%s on %s type %s (%s)\n"
,m->mnt_fsname
,m->mnt_dir
,m->mnt_type
,m->mnt_opts);
char *blockDevice = m->mnt_fsname;
if (strcmp (blockDevice, "/dev/root") == 0)
blockDevice = (getfsfile ("/"))->fs_spec;
printf ("%s on %s type %s (%s)\n", blockDevice, m->mnt_dir,
m->mnt_type, m->mnt_opts);
}
endmntent (mountTable);
}
return 0;
return( TRUE);
}
while ( argc >= 2 && argv[1][0] == '-' ) {
switch ( argv[1][1] ) {
case 'f':
fake = 1;
break;
case 'n':
noMtab = 1;
break;
/* Parse options */
while (**argv) {
if (**argv == '-') {
switch (**argv) {
case 'o':
if ( argc < 3 ) {
usage(mount_usage);
return 1;
if (++argv == 0) {
fprintf (stderr, "%s\n", mount_usage);
return( FALSE);
}
parse_mount_options(argv[2], &flags, string_flags);
parse_mount_options (*argv, &flags, string_flags);
argc--;
argv++;
break;
@ -371,27 +203,28 @@ mount_main(struct FileInfo * i, int argc, char * * argv)
flags |= MS_RDONLY;
break;
case 't':
if ( argc < 3 ) {
usage(mount_usage);
return 1;
if (++argv == 0) {
fprintf (stderr, "%s\n", mount_usage);
return( FALSE);
}
filesystemType = argv[2];
filesystemType = *argv;
argc--;
argv++;
break;
case 'v':
break;
case 'w':
flags &= ~MS_RDONLY;
break;
case 'a':
all = 1;
break;
default:
usage(mount_usage);
return 1;
case 'v':
case 'h':
case '-':
fprintf (stderr, "%s\n", mount_usage);
return( TRUE);
}
argc--;
}
i--;
argv++;
}
@ -400,31 +233,40 @@ mount_main(struct FileInfo * i, int argc, char * * argv)
FILE *f = setmntent ("/etc/fstab", "r");
if (f == NULL) {
return 1;
perror("/etc/fstab");
return( FALSE);
}
// FIXME: Combine read routine (make new function) with unmount_all to save space.
// FIXME: Combine read routine (make new function) with unmount_all
// to save space.
while ((m = getmntent (f)) != NULL) {
// If the file system isn't noauto, and isn't mounted on /, mount it
if ((!strstr(m->mnt_opts, "noauto")) && (m->mnt_dir[1] != '\0')
&& !((m->mnt_type[0] == 's') && (m->mnt_type[1] == 'w'))
// If the file system isn't noauto, and isn't mounted on /, mount
// it
if ((!strstr (m->mnt_opts, "noauto"))
&& (m->mnt_dir[1] != '\0') && !((m->mnt_type[0] == 's')
&& (m->mnt_type[1] == 'w'))
&& !((m->mnt_type[0] == 'n') && (m->mnt_type[1] == 'f'))) {
mount_one(m->mnt_fsname, m->mnt_dir, m->mnt_type, flags, m->mnt_opts, noMtab, fake);
mount_one (m->mnt_fsname, m->mnt_dir, m->mnt_type, flags,
m->mnt_opts);
}
}
endmntent (f);
} else {
if (argc >= 3) {
if ( mount_one( argv[1], argv[2], filesystemType, flags, string_flags, noMtab, fake) == 0 )
return 0;
while (i < argc)
argv--;
while (**argv == '-')
argv++;
if (mount_one
(*argv, *(argv+1), filesystemType, flags,
string_flags) == 0) return 0;
else
return 1;
return( FALSE);
} else {
usage(mount_usage);
return 1;
fprintf (stderr, "%s\n", mount_usage);
return( FALSE);
}
}
return 0;
return( TRUE);
}

100
mv.c
View File

@ -1,38 +1,84 @@
/*
* Mini mv implementation for busybox
*
* Copyright (C) 1998 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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
#include "internal.h"
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <utime.h>
#include <errno.h>
const char mv_usage[] = "mv source-file destination-file\n"
"\t\tmv source-file [source-file ...] destination-directory\n"
"\n"
"\tMove the source files to the destination.\n"
"\n";
const char mv_usage[] = "source-file [source-file ...] destination-file\n"
"\n" "\tMove the source files to the destination.\n" "\n";
extern int
mv_fn(const struct FileInfo * i)
extern int mv_main (int argc, char **argv)
{
struct stat destination_stat;
char d[1024];
struct FileInfo n;
const char *srcName;
const char *destName;
const char *lastArg;
BOOL dirFlag;
if ( stat(i->destination, &destination_stat) == 0 ) {
if ( i->stat.st_ino == destination_stat.st_ino
&& i->stat.st_dev == destination_stat.st_dev )
return 0; /* Move file to itself. */
if (argc < 3) {
fprintf (stderr, "Usage: %s %s", *argv, mv_usage);
return (FALSE);
}
if ( (destination_stat.st_mode & S_IFMT) == S_IFDIR ) {
n = *i;
n.destination = join_paths(d, i->destination, basename(i->source));
i = &n;
lastArg = argv[argc - 1];
dirFlag = isDirectory (lastArg);
if ((argc > 3) && !dirFlag) {
fprintf (stderr, "%s: not a directory\n", lastArg);
return (FALSE);
}
if ( rename(i->source, i->destination) == 0 )
return 0;
else if ( errno == EXDEV && is_a_directory(i->source) ) {
fprintf(stderr
,"%s: Can't move directory across filesystems.\n"
,i->source);
return 1;
while (argc-- > 2) {
srcName = *(++argv);
if (access (srcName, 0) < 0) {
perror (srcName);
continue;
}
else
return cp_fn(i);
destName = lastArg;
if (dirFlag)
destName = buildName (destName, srcName);
if (rename (srcName, destName) >= 0)
continue;
if (errno != EXDEV) {
perror (destName);
continue;
}
if (!copyFile (srcName, destName, TRUE))
continue;
if (unlink (srcName) < 0)
perror (srcName);
}
return (TRUE);
}

89
touch.c
View File

@ -1,20 +1,85 @@
#include "internal.h"
#include <sys/types.h>
#include <stdio.h>
#include <utime.h>
/*
* Mini touch implementation for busybox
*
* Copyright (C) 1998 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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
const char touch_usage[] = "touch [-c] file [file ...]\n"
"\n"
#include "internal.h"
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <utime.h>
#include <errno.h>
const char touch_usage[] = "touch [-c] file [file ...]\n\n"
"\tUpdate the last-modified date on the given file[s].\n";
extern int
touch_fn(const struct FileInfo * i)
touch_main(int argc, char **argv)
{
if ( (utime(i->source, 0) != 0) && (i->create != 1) ) {
if ( fopen(i->source, "w") == NULL ) {
name_and_error(i->source);
return 1;
int fd;
int create=TRUE;
if (argc < 2) {
fprintf(stderr, "Usage: %s %s", *argv, touch_usage);
exit( FALSE);
}
argc--;
argv++;
/* Parse options */
while (**argv == '-') {
while (*++(*argv)) switch (**argv) {
case 'c':
create = FALSE;
break;
default:
fprintf(stderr, "Unknown option: %c\n", **argv);
exit( FALSE);
}
argc--;
argv++;
}
fd = open (*argv, (create==FALSE)? O_RDWR : O_RDWR | O_CREAT, 0644);
if (fd < 0 ) {
if (create==FALSE && errno == ENOENT)
exit( TRUE);
else {
perror("touch");
exit( FALSE);
}
}
return 0;
close( fd);
if (utime (*argv, NULL)) {
perror("touch");
exit( FALSE);
}
else
exit( TRUE);
}

370
util-linux/mount.c
View File

@ -1,9 +1,29 @@
/*
3/21/1999 Charles P. Wright <cpwright@cpwright.com>
searches through fstab when -a is passed
will try mounting stuff with all fses when passed -t auto
1999-04-17 Dave Cinege...Rewrote -t auto. Fixed ro mtab.
* Mini mount implementation for busybox
*
* Copyright (C) 1999 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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* 3/21/1999 Charles P. Wright <cpwright@cpwright.com>
* searches through fstab when -a is passed
* will try mounting stuff with all fses when passed -t auto
*
* 1999-04-17 Dave Cinege...Rewrote -t auto. Fixed ro mtab.
* 1999-10-07 Erik Andersen. Removed mtab usage, major adjustments,
* and some serious dieting all around.
*/
#include "internal.h"
@ -15,14 +35,13 @@
#include <mntent.h>
#include <sys/mount.h>
#include <ctype.h>
#include <fstab.h>
const char mount_usage[] = "mount\n"
"\t\tmount [flags] special-device directory\n"
const char mount_usage[] = "Usage:\tmount [flags]\n"
"\tmount [flags] device directory [-o options,more-options]\n"
"\n"
"Flags:\n"
"\t-a:\tMount all file systems in fstab.\n"
"\t-f:\t\"Fake\" mount. Add entry to mount table but don't mount it.\n"
"\t-n:\tDon't write a mount table entry.\n"
"\t-o option:\tOne of many filesystem options, listed below.\n"
"\t-r:\tMount the filesystem read-only.\n"
"\t-t filesystem-type:\tSpecify the filesystem type.\n"
@ -61,32 +80,21 @@ static const struct mount_options mount_options[] = {
{0, 0, 0}
};
static void
show_flags(unsigned long flags, char * buffer)
{
const struct mount_options * f = mount_options;
while ( f->name ) {
if ( flags & f->and ) {
int length = strlen(f->name);
memcpy(buffer, f->name, length);
buffer += length;
*buffer++ = ',';
*buffer = '\0';
}
f++;
}
}
static void
one_option(
char * option
,unsigned long * flags
,char * data)
parse_mount_options ( char *options, unsigned long *flags, char *data)
{
printf("option=%s\n", options);
while (*options) {
char *comma = strchr (options, ',');
const struct mount_options* f = mount_options;
if (comma)
*comma = '\0';
printf("checking option=%s vs %s\n", options, f->name);
while (f->name != 0) {
if ( strcasecmp(f->name, option) == 0 ) {
printf("checking option=%s vs %s\n", options, f->name);
if (strcasecmp (f->name, options) == 0) {
*flags &= f->and;
*flags |= f->or;
return;
@ -97,56 +105,37 @@ one_option(
data += strlen (data);
*data++ = ',';
}
strcpy(data, option);
}
static void
parse_mount_options(
char * options
,unsigned long * flags
,char * data)
{
while ( *options ) {
char * comma = strchr(options, ',');
if ( comma )
*comma = '\0';
one_option(options, flags, data);
strcpy (data, options);
if (comma) {
*comma = ',';
options = ++comma;
}
else
} else
break;
}
}
int
mount_one (
char * blockDevice
,char * directory
,char * filesystemType
,unsigned long flags
,char * string_flags
,int noMtab
,int fake)
char *blockDevice, char *directory, char *filesystemType,
unsigned long flags, char *string_flags)
{
int error = 0;
int status = 0;
char buf[255];
if (!fake) {
if (*filesystemType == 'a') { //Will fail on real FS starting with 'a'
if (strcmp(filesystemType, "auto") == 0) {
FILE *f = fopen ("/proc/filesystems", "r");
if (f == NULL) return 1;
if (f == NULL)
return( FALSE);
while (fgets (buf, sizeof (buf), f) != NULL) {
filesystemType = buf;
if (*filesystemType == '\t') { // Not a nodev filesystem
while (*filesystemType && *filesystemType != '\n') filesystemType++;
// Add NULL termination to each line
while (*filesystemType && *filesystemType != '\n')
filesystemType++;
*filesystemType = '\0';
filesystemType = buf;
@ -154,216 +143,59 @@ mount_one(
status = mount (blockDevice, directory, filesystemType,
flags | MS_MGC_VAL, string_flags);
error = errno;
if (status == 0) break;
if (status == 0)
break;
}
}
fclose (f);
} else {
status = mount (blockDevice, directory, filesystemType,
flags | MS_MGC_VAL, string_flags);
error = errno;
}
}
if ( status == 0 ) {
char * s = &string_flags[strlen(string_flags)];
FILE * mountTable;
if ( s != string_flags ) {
*s++ = ',';
show_flags(flags, s);
if (status) {
fprintf (stderr, "Mounting %s on %s failed: %s\n",
blockDevice, directory, strerror(errno));
return (FALSE);
}
if ( !noMtab && (mountTable = setmntent("/etc/mtab", "a+")) ) {
int length = strlen(directory);
struct mntent m;
if ( length > 1 && directory[length - 1] == '/' )
directory[length - 1] = '\0';
if ( filesystemType == 0 ) {
struct mntent * p
= findMountPoint(blockDevice, "/proc/mounts");
if ( p && p->mnt_type )
filesystemType = p->mnt_type;
}
m.mnt_fsname = blockDevice;
m.mnt_dir = directory;
m.mnt_type = filesystemType ? filesystemType : "default";
if (*string_flags) {
m.mnt_opts = string_flags;
} else {
if ( (flags | MS_RDONLY) == flags )
m.mnt_opts = "ro";
else
m.mnt_opts = "rw";
return (TRUE);
}
m.mnt_freq = 0;
m.mnt_passno = 0;
addmntent(mountTable, &m);
endmntent(mountTable);
}
return 0;
} else {
fprintf(stderr, "Mount %s", blockDevice);
if ( filesystemType && *filesystemType )
fprintf(stderr, " (type %s)", filesystemType);
fprintf(
stderr
," on %s: "
,directory);
switch ( error ) {
case EPERM:
if (geteuid() == 0)
fprintf(
stderr
,"mount point %s is not a directory"
,blockDevice);
else
fprintf(
stderr
,"must be superuser to use mount");
break;
case EBUSY:
fprintf(
stderr
,"%s already mounted or %s busy"
,blockDevice
,directory);
break;
case ENOENT:
extern int mount_main (int argc, char **argv)
{
struct stat statbuf;
if ( stat(directory, &statbuf) != 0 )
fprintf(
stderr
,"directory %s does not exist"
,directory);
else if ( stat(blockDevice, &statbuf) != 0 )
fprintf(
stderr
,"block device %s does not exist"
,blockDevice);
else
fprintf(
stderr
,"%s is not mounted on %s, but the mount table says it is."
,blockDevice
,directory);
break;
}
case ENOTDIR:
fprintf(
stderr
,"%s is not a directory"
,directory);
break;
case EINVAL:
fprintf(
stderr
,"wrong filesystem type, or bad superblock on %s"
,blockDevice);
break;
case EMFILE:
fprintf(stderr, "mount table full");
break;
case EIO:
fprintf(
stderr
,"I/O error reading %s"
,blockDevice);
break;
case ENODEV:
{
FILE * f = fopen("/proc/filesystems", "r");
fprintf(
stderr
,"filesystem type %s not in kernel.\n"
,filesystemType);
fprintf(stderr, "Do you need to load a module?\n");
if ( f ) {
char buf[100];
fprintf(
stderr
,"Here are the filesystem types the kernel"
" can mount:\n");
while ( fgets(buf, sizeof(buf), f) != 0 )
fprintf(stderr, "\t%s", buf);
fclose(f);
}
break;
}
case ENOTBLK:
fprintf(
stderr
,"%s is not a block device"
,blockDevice);
break;
case ENXIO:
fprintf(
stderr
,"%s is not a valid block device"
,blockDevice);
break;
default:
fputs(strerror(errno), stderr);
}
putc('\n', stderr);
return -1;
}
}
extern int
mount_main(struct FileInfo * i, int argc, char * * argv)
{
char string_flags[1024];
char string_flags[1024]="\0";
unsigned long flags = 0;
char *filesystemType = "auto";
int fake = 0;
int noMtab = 0;
int all = 0;
*string_flags = '\0';
int i = argc;
if (argc == 1) {
FILE *mountTable;
if ( (mountTable = setmntent("/etc/mtab", "r")) ) {
if ((mountTable = setmntent ("/proc/mounts", "r"))) {
struct mntent *m;
while ((m = getmntent (mountTable)) != 0) {
printf(
"%s on %s type %s (%s)\n"
,m->mnt_fsname
,m->mnt_dir
,m->mnt_type
,m->mnt_opts);
char *blockDevice = m->mnt_fsname;
if (strcmp (blockDevice, "/dev/root") == 0)
blockDevice = (getfsfile ("/"))->fs_spec;
printf ("%s on %s type %s (%s)\n", blockDevice, m->mnt_dir,
m->mnt_type, m->mnt_opts);
}
endmntent (mountTable);
}
return 0;
return( TRUE);
}
while ( argc >= 2 && argv[1][0] == '-' ) {
switch ( argv[1][1] ) {
case 'f':
fake = 1;
break;
case 'n':
noMtab = 1;
break;
/* Parse options */
while (**argv) {
if (**argv == '-') {
switch (**argv) {
case 'o':
if ( argc < 3 ) {
usage(mount_usage);
return 1;
if (++argv == 0) {
fprintf (stderr, "%s\n", mount_usage);
return( FALSE);
}
parse_mount_options(argv[2], &flags, string_flags);
parse_mount_options (*argv, &flags, string_flags);
argc--;
argv++;
break;
@ -371,27 +203,28 @@ mount_main(struct FileInfo * i, int argc, char * * argv)
flags |= MS_RDONLY;
break;
case 't':
if ( argc < 3 ) {
usage(mount_usage);
return 1;
if (++argv == 0) {
fprintf (stderr, "%s\n", mount_usage);
return( FALSE);
}
filesystemType = argv[2];
filesystemType = *argv;
argc--;
argv++;
break;
case 'v':
break;
case 'w':
flags &= ~MS_RDONLY;
break;
case 'a':
all = 1;
break;
default:
usage(mount_usage);
return 1;
case 'v':
case 'h':
case '-':
fprintf (stderr, "%s\n", mount_usage);
return( TRUE);
}
argc--;
}
i--;
argv++;
}
@ -400,31 +233,40 @@ mount_main(struct FileInfo * i, int argc, char * * argv)
FILE *f = setmntent ("/etc/fstab", "r");
if (f == NULL) {
return 1;
perror("/etc/fstab");
return( FALSE);
}
// FIXME: Combine read routine (make new function) with unmount_all to save space.
// FIXME: Combine read routine (make new function) with unmount_all
// to save space.
while ((m = getmntent (f)) != NULL) {
// If the file system isn't noauto, and isn't mounted on /, mount it
if ((!strstr(m->mnt_opts, "noauto")) && (m->mnt_dir[1] != '\0')
&& !((m->mnt_type[0] == 's') && (m->mnt_type[1] == 'w'))
// If the file system isn't noauto, and isn't mounted on /, mount
// it
if ((!strstr (m->mnt_opts, "noauto"))
&& (m->mnt_dir[1] != '\0') && !((m->mnt_type[0] == 's')
&& (m->mnt_type[1] == 'w'))
&& !((m->mnt_type[0] == 'n') && (m->mnt_type[1] == 'f'))) {
mount_one(m->mnt_fsname, m->mnt_dir, m->mnt_type, flags, m->mnt_opts, noMtab, fake);
mount_one (m->mnt_fsname, m->mnt_dir, m->mnt_type, flags,
m->mnt_opts);
}
}
endmntent (f);
} else {
if (argc >= 3) {
if ( mount_one( argv[1], argv[2], filesystemType, flags, string_flags, noMtab, fake) == 0 )
return 0;
while (i < argc)
argv--;
while (**argv == '-')
argv++;
if (mount_one
(*argv, *(argv+1), filesystemType, flags,
string_flags) == 0) return 0;
else
return 1;
return( FALSE);
} else {
usage(mount_usage);
return 1;
fprintf (stderr, "%s\n", mount_usage);
return( FALSE);
}
}
return 0;
return( TRUE);
}