mirror of
https://github.com/sheumann/hush.git
synced 2024-07-07 10:28:56 +00:00
Run through indent, fix comments
This commit is contained in:
Glenn L McGrath
parent
7c58e9be69
commit
9fef17dec3
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
418
libbb/dump.c
418
libbb/dump.c
@ -30,21 +30,21 @@
|
||||
|
||||
enum _vflag vflag = FIRST;
|
||||
FS *fshead; /* head of format strings */
|
||||
extern FS *fshead; /* head of format strings */
|
||||
extern FS *fshead; /* head of format strings */
|
||||
extern int blocksize;
|
||||
static FU *endfu;
|
||||
static char **_argv;
|
||||
static off_t savaddress; /* saved address/offset in stream */
|
||||
static off_t eaddress; /* end address */
|
||||
static off_t address; /* address/offset in stream */
|
||||
off_t skip; /* bytes to skip */
|
||||
static off_t savaddress; /* saved address/offset in stream */
|
||||
static off_t eaddress; /* end address */
|
||||
static off_t address; /* address/offset in stream */
|
||||
off_t skip; /* bytes to skip */
|
||||
off_t saveaddress;
|
||||
int exitval; /* final exit value */
|
||||
int blocksize; /* data block size */
|
||||
int length = -1; /* max bytes to read */
|
||||
int exitval; /* final exit value */
|
||||
int blocksize; /* data block size */
|
||||
int length = -1; /* max bytes to read */
|
||||
|
||||
|
||||
int size(FS *fs)
|
||||
int size(FS * fs)
|
||||
{
|
||||
register FU *fu;
|
||||
register int bcnt, cursize;
|
||||
@ -69,23 +69,33 @@ int size(FS *fs)
|
||||
prec = atoi(fmt);
|
||||
while (isdigit(*++fmt));
|
||||
}
|
||||
switch(*fmt) {
|
||||
switch (*fmt) {
|
||||
case 'c':
|
||||
bcnt += 1;
|
||||
break;
|
||||
case 'd': case 'i': case 'o': case 'u':
|
||||
case 'x': case 'X':
|
||||
case 'd':
|
||||
case 'i':
|
||||
case 'o':
|
||||
case 'u':
|
||||
case 'x':
|
||||
case 'X':
|
||||
bcnt += 4;
|
||||
break;
|
||||
case 'e': case 'E': case 'f': case 'g': case 'G':
|
||||
case 'e':
|
||||
case 'E':
|
||||
case 'f':
|
||||
case 'g':
|
||||
case 'G':
|
||||
bcnt += 8;
|
||||
break;
|
||||
case 's':
|
||||
bcnt += prec;
|
||||
break;
|
||||
case '_':
|
||||
switch(*++fmt) {
|
||||
case 'c': case 'p': case 'u':
|
||||
switch (*++fmt) {
|
||||
case 'c':
|
||||
case 'p':
|
||||
case 'u':
|
||||
bcnt += 1;
|
||||
break;
|
||||
}
|
||||
@ -93,10 +103,10 @@ int size(FS *fs)
|
||||
}
|
||||
cursize += bcnt * fu->reps;
|
||||
}
|
||||
return(cursize);
|
||||
return (cursize);
|
||||
}
|
||||
|
||||
void rewrite(FS *fs)
|
||||
void rewrite(FS * fs)
|
||||
{
|
||||
enum { NOTOKAY, USEBCNT, USEPREC } sokay;
|
||||
register PR *pr, **nextpr = NULL;
|
||||
@ -112,7 +122,7 @@ void rewrite(FS *fs)
|
||||
*/
|
||||
for (nconv = 0, fmtp = fu->fmt; *fmtp; nextpr = &pr->nextpr) {
|
||||
/* NOSTRICT */
|
||||
pr = (PR *)xmalloc(sizeof(PR));
|
||||
pr = (PR *) xmalloc(sizeof(PR));
|
||||
if (!fu->nextpr)
|
||||
fu->nextpr = pr;
|
||||
else
|
||||
@ -143,53 +153,64 @@ void rewrite(FS *fs)
|
||||
sokay = USEPREC;
|
||||
prec = atoi(p1);
|
||||
while (isdigit(*++p1));
|
||||
}
|
||||
else
|
||||
} else
|
||||
sokay = NOTOKAY;
|
||||
}
|
||||
|
||||
p2 = p1 + 1; /* set end pointer */
|
||||
p2 = p1 + 1; /* set end pointer */
|
||||
|
||||
/*
|
||||
* figure out the byte count for each conversion;
|
||||
* rewrite the format as necessary, set up blank-
|
||||
* padding for end of data.
|
||||
*/
|
||||
switch(*p1) {
|
||||
switch (*p1) {
|
||||
case 'c':
|
||||
pr->flags = F_CHAR;
|
||||
switch(fu->bcnt) {
|
||||
case 0: case 1:
|
||||
switch (fu->bcnt) {
|
||||
case 0:
|
||||
case 1:
|
||||
pr->bcnt = 1;
|
||||
break;
|
||||
default:
|
||||
p1[1] = '\0';
|
||||
error_msg_and_die("bad byte count for conversion character %s.", p1);
|
||||
error_msg_and_die
|
||||
("bad byte count for conversion character %s.", p1);
|
||||
}
|
||||
break;
|
||||
case 'd': case 'i':
|
||||
case 'd':
|
||||
case 'i':
|
||||
pr->flags = F_INT;
|
||||
goto sw1;
|
||||
case 'l':
|
||||
++p2;
|
||||
switch(p1[1]) {
|
||||
case 'd': case 'i':
|
||||
switch (p1[1]) {
|
||||
case 'd':
|
||||
case 'i':
|
||||
++p1;
|
||||
pr->flags = F_INT;
|
||||
goto sw1;
|
||||
case 'o': case 'u': case 'x': case 'X':
|
||||
case 'o':
|
||||
case 'u':
|
||||
case 'x':
|
||||
case 'X':
|
||||
++p1;
|
||||
pr->flags = F_UINT;
|
||||
goto sw1;
|
||||
default:
|
||||
p1[2] = '\0';
|
||||
error_msg_and_die("hexdump: bad conversion character %%%s.\n", p1);
|
||||
error_msg_and_die
|
||||
("hexdump: bad conversion character %%%s.\n", p1);
|
||||
}
|
||||
/* NOTREACHED */
|
||||
case 'o': case 'u': case 'x': case 'X':
|
||||
case 'o':
|
||||
case 'u':
|
||||
case 'x':
|
||||
case 'X':
|
||||
pr->flags = F_UINT;
|
||||
sw1: switch(fu->bcnt) {
|
||||
case 0: case 4:
|
||||
sw1:switch (fu->bcnt) {
|
||||
case 0:
|
||||
case 4:
|
||||
pr->bcnt = 4;
|
||||
break;
|
||||
case 1:
|
||||
@ -200,13 +221,19 @@ sw1: switch(fu->bcnt) {
|
||||
break;
|
||||
default:
|
||||
p1[1] = '\0';
|
||||
error_msg_and_die("bad byte count for conversion character %s.", p1);
|
||||
error_msg_and_die
|
||||
("bad byte count for conversion character %s.", p1);
|
||||
}
|
||||
break;
|
||||
case 'e': case 'E': case 'f': case 'g': case 'G':
|
||||
case 'e':
|
||||
case 'E':
|
||||
case 'f':
|
||||
case 'g':
|
||||
case 'G':
|
||||
pr->flags = F_DBL;
|
||||
switch(fu->bcnt) {
|
||||
case 0: case 8:
|
||||
switch (fu->bcnt) {
|
||||
case 0:
|
||||
case 8:
|
||||
pr->bcnt = 8;
|
||||
break;
|
||||
case 4:
|
||||
@ -214,14 +241,16 @@ sw1: switch(fu->bcnt) {
|
||||
break;
|
||||
default:
|
||||
p1[1] = '\0';
|
||||
error_msg_and_die("bad byte count for conversion character %s.", p1);
|
||||
error_msg_and_die
|
||||
("bad byte count for conversion character %s.", p1);
|
||||
}
|
||||
break;
|
||||
case 's':
|
||||
pr->flags = F_STR;
|
||||
switch(sokay) {
|
||||
switch (sokay) {
|
||||
case NOTOKAY:
|
||||
error_msg_and_die("%%s requires a precision or a byte count.");
|
||||
error_msg_and_die
|
||||
("%%s requires a precision or a byte count.");
|
||||
case USEBCNT:
|
||||
pr->bcnt = fu->bcnt;
|
||||
break;
|
||||
@ -232,7 +261,7 @@ sw1: switch(fu->bcnt) {
|
||||
break;
|
||||
case '_':
|
||||
++p2;
|
||||
switch(p1[1]) {
|
||||
switch (p1[1]) {
|
||||
case 'A':
|
||||
endfu = fu;
|
||||
fu->flags |= F_IGNORE;
|
||||
@ -240,18 +269,21 @@ sw1: switch(fu->bcnt) {
|
||||
case 'a':
|
||||
pr->flags = F_ADDRESS;
|
||||
++p2;
|
||||
switch(p1[2]) {
|
||||
case 'd': case 'o': case'x':
|
||||
switch (p1[2]) {
|
||||
case 'd':
|
||||
case 'o':
|
||||
case 'x':
|
||||
*p1 = p1[2];
|
||||
break;
|
||||
default:
|
||||
p1[3] = '\0';
|
||||
error_msg_and_die("hexdump: bad conversion character %%%s.\n", p1);
|
||||
error_msg_and_die
|
||||
("hexdump: bad conversion character %%%s.\n", p1);
|
||||
}
|
||||
break;
|
||||
case 'c':
|
||||
pr->flags = F_C;
|
||||
/* *p1 = 'c'; set in conv_c */
|
||||
/* *p1 = 'c'; set in conv_c */
|
||||
goto sw2;
|
||||
case 'p':
|
||||
pr->flags = F_P;
|
||||
@ -259,24 +291,29 @@ sw1: switch(fu->bcnt) {
|
||||
goto sw2;
|
||||
case 'u':
|
||||
pr->flags = F_U;
|
||||
/* *p1 = 'c'; set in conv_u */
|
||||
sw2: switch(fu->bcnt) {
|
||||
case 0: case 1:
|
||||
/* *p1 = 'c'; set in conv_u */
|
||||
sw2:switch (fu->bcnt) {
|
||||
case 0:
|
||||
case 1:
|
||||
pr->bcnt = 1;
|
||||
break;
|
||||
default:
|
||||
p1[2] = '\0';
|
||||
error_msg_and_die("bad byte count for conversion character %s.", p1);
|
||||
error_msg_and_die
|
||||
("bad byte count for conversion character %s.",
|
||||
p1);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
p1[2] = '\0';
|
||||
error_msg_and_die("hexdump: bad conversion character %%%s.\n", p1);
|
||||
error_msg_and_die
|
||||
("hexdump: bad conversion character %%%s.\n", p1);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
p1[1] = '\0';
|
||||
error_msg_and_die("hexdump: bad conversion character %%%s.\n", p1);
|
||||
error_msg_and_die("hexdump: bad conversion character %%%s.\n",
|
||||
p1);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -292,8 +329,9 @@ sw2: switch(fu->bcnt) {
|
||||
fmtp = p2;
|
||||
|
||||
/* only one conversion character if byte count */
|
||||
if (!(pr->flags&F_ADDRESS) && fu->bcnt && nconv++) {
|
||||
error_msg_and_die("hexdump: byte count with multiple conversion characters.\n");
|
||||
if (!(pr->flags & F_ADDRESS) && fu->bcnt && nconv++) {
|
||||
error_msg_and_die
|
||||
("hexdump: byte count with multiple conversion characters.\n");
|
||||
}
|
||||
}
|
||||
/*
|
||||
@ -315,7 +353,7 @@ sw2: switch(fu->bcnt) {
|
||||
*/
|
||||
for (fu = fs->nextfu;; fu = fu->nextfu) {
|
||||
if (!fu->nextfu && fs->bcnt < blocksize &&
|
||||
!(fu->flags&F_SETREP) && fu->bcnt)
|
||||
!(fu->flags & F_SETREP) && fu->bcnt)
|
||||
fu->reps += (blocksize - fs->bcnt) / fu->bcnt;
|
||||
if (fu->reps > 1) {
|
||||
for (pr = fu->nextpr;; pr = pr->nextpr)
|
||||
@ -339,11 +377,10 @@ static void doskip(char *fname, int statok)
|
||||
if (fstat(fileno(stdin), &sbuf)) {
|
||||
perror_msg_and_die("hexdump: %s", fname);
|
||||
}
|
||||
if ( ( ! (S_ISCHR(sbuf.st_mode) ||
|
||||
S_ISBLK(sbuf.st_mode) ||
|
||||
S_ISFIFO(sbuf.st_mode)) ) &&
|
||||
skip >= sbuf.st_size) {
|
||||
/* If size valid and skip >= size */
|
||||
if ((!(S_ISCHR(sbuf.st_mode) ||
|
||||
S_ISBLK(sbuf.st_mode) ||
|
||||
S_ISFIFO(sbuf.st_mode))) && skip >= sbuf.st_size) {
|
||||
/* If size valid and skip >= size */
|
||||
skip -= sbuf.st_size;
|
||||
address += sbuf.st_size;
|
||||
return;
|
||||
@ -363,7 +400,7 @@ int next(char **argv)
|
||||
|
||||
if (argv) {
|
||||
_argv = argv;
|
||||
return(1);
|
||||
return (1);
|
||||
}
|
||||
for (;;) {
|
||||
if (*_argv) {
|
||||
@ -376,7 +413,7 @@ int next(char **argv)
|
||||
statok = done = 1;
|
||||
} else {
|
||||
if (done++)
|
||||
return(0);
|
||||
return (0);
|
||||
statok = 0;
|
||||
}
|
||||
if (skip)
|
||||
@ -384,13 +421,12 @@ int next(char **argv)
|
||||
if (*_argv)
|
||||
++_argv;
|
||||
if (!skip)
|
||||
return(1);
|
||||
return (1);
|
||||
}
|
||||
/* NOTREACHED */
|
||||
}
|
||||
|
||||
static u_char *
|
||||
get(void)
|
||||
static u_char *get(void)
|
||||
{
|
||||
static int ateof = 1;
|
||||
static u_char *curp, *savp;
|
||||
@ -399,8 +435,8 @@ get(void)
|
||||
u_char *tmpp;
|
||||
|
||||
if (!curp) {
|
||||
curp = (u_char *)xmalloc(blocksize);
|
||||
savp = (u_char *)xmalloc(blocksize);
|
||||
curp = (u_char *) xmalloc(blocksize);
|
||||
savp = (u_char *) xmalloc(blocksize);
|
||||
} else {
|
||||
tmpp = curp;
|
||||
curp = savp;
|
||||
@ -413,22 +449,22 @@ get(void)
|
||||
* and no other files are available, zero-pad the rest of the
|
||||
* block and set the end flag.
|
||||
*/
|
||||
if (!length || (ateof && !next((char **)NULL))) {
|
||||
if (!length || (ateof && !next((char **) NULL))) {
|
||||
if (need == blocksize) {
|
||||
return((u_char *)NULL);
|
||||
return ((u_char *) NULL);
|
||||
}
|
||||
if (vflag != ALL && !bcmp(curp, savp, nread)) {
|
||||
if (vflag != DUP) {
|
||||
printf("*\n");
|
||||
}
|
||||
return((u_char *)NULL);
|
||||
return ((u_char *) NULL);
|
||||
}
|
||||
bzero((char *)curp + nread, need);
|
||||
bzero((char *) curp + nread, need);
|
||||
eaddress = address + nread;
|
||||
return(curp);
|
||||
return (curp);
|
||||
}
|
||||
n = fread((char *)curp + nread, sizeof(u_char),
|
||||
length == -1 ? need : MIN(length, need), stdin);
|
||||
n = fread((char *) curp + nread, sizeof(u_char),
|
||||
length == -1 ? need : MIN(length, need), stdin);
|
||||
if (!n) {
|
||||
if (ferror(stdin)) {
|
||||
perror_msg("%s", _argv[-1]);
|
||||
@ -441,12 +477,11 @@ get(void)
|
||||
length -= n;
|
||||
}
|
||||
if (!(need -= n)) {
|
||||
if (vflag == ALL || vflag == FIRST ||
|
||||
bcmp(curp, savp, blocksize)) {
|
||||
if (vflag == ALL || vflag == FIRST || bcmp(curp, savp, blocksize)) {
|
||||
if (vflag == DUP || vflag == FIRST) {
|
||||
vflag = WAIT;
|
||||
}
|
||||
return(curp);
|
||||
return (curp);
|
||||
}
|
||||
if (vflag == WAIT) {
|
||||
printf("*\n");
|
||||
@ -461,7 +496,7 @@ get(void)
|
||||
}
|
||||
}
|
||||
|
||||
static void bpad(PR *pr)
|
||||
static void bpad(PR * pr)
|
||||
{
|
||||
register char *p1, *p2;
|
||||
|
||||
@ -473,18 +508,18 @@ static void bpad(PR *pr)
|
||||
*pr->cchar = 's';
|
||||
for (p1 = pr->fmt; *p1 != '%'; ++p1);
|
||||
for (p2 = ++p1; *p1 && index(" -0+#", *p1); ++p1);
|
||||
while ((*p2++ = *p1++) != 0) ;
|
||||
while ((*p2++ = *p1++) != 0);
|
||||
}
|
||||
|
||||
void conv_c(PR *pr, u_char *p)
|
||||
void conv_c(PR * pr, u_char * p)
|
||||
{
|
||||
char buf[10], *str;
|
||||
|
||||
switch(*p) {
|
||||
switch (*p) {
|
||||
case '\0':
|
||||
str = "\\0";
|
||||
goto strpr;
|
||||
/* case '\a': */
|
||||
/* case '\a': */
|
||||
case '\007':
|
||||
str = "\\a";
|
||||
goto strpr;
|
||||
@ -511,22 +546,22 @@ void conv_c(PR *pr, u_char *p)
|
||||
}
|
||||
if (isprint(*p)) {
|
||||
*pr->cchar = 'c';
|
||||
(void)printf(pr->fmt, *p);
|
||||
(void) printf(pr->fmt, *p);
|
||||
} else {
|
||||
sprintf(str = buf, "%03o", (int)*p);
|
||||
strpr:
|
||||
sprintf(str = buf, "%03o", (int) *p);
|
||||
strpr:
|
||||
*pr->cchar = 's';
|
||||
printf(pr->fmt, str);
|
||||
}
|
||||
}
|
||||
|
||||
void conv_u(PR *pr, u_char *p)
|
||||
void conv_u(PR * pr, u_char * p)
|
||||
{
|
||||
static char *list[] = {
|
||||
"nul", "soh", "stx", "etx", "eot", "enq", "ack", "bel",
|
||||
"bs", "ht", "lf", "vt", "ff", "cr", "so", "si",
|
||||
"bs", "ht", "lf", "vt", "ff", "cr", "so", "si",
|
||||
"dle", "dcl", "dc2", "dc3", "dc4", "nak", "syn", "etb",
|
||||
"can", "em", "sub", "esc", "fs", "gs", "rs", "us",
|
||||
"can", "em", "sub", "esc", "fs", "gs", "rs", "us",
|
||||
};
|
||||
|
||||
/* od used nl, not lf */
|
||||
@ -541,118 +576,128 @@ void conv_u(PR *pr, u_char *p)
|
||||
printf(pr->fmt, *p);
|
||||
} else {
|
||||
*pr->cchar = 'x';
|
||||
printf(pr->fmt, (int)*p);
|
||||
printf(pr->fmt, (int) *p);
|
||||
}
|
||||
}
|
||||
|
||||
void display(void)
|
||||
{
|
||||
// extern FU *endfu;
|
||||
/* extern FU *endfu; */
|
||||
register FS *fs;
|
||||
register FU *fu;
|
||||
register PR *pr;
|
||||
register int cnt;
|
||||
register u_char *bp;
|
||||
// off_t saveaddress;
|
||||
|
||||
/* off_t saveaddress; */
|
||||
u_char savech = 0, *savebp;
|
||||
|
||||
while ((bp = get()) != NULL) {
|
||||
for (fs = fshead, savebp = bp, saveaddress = address; fs;
|
||||
fs = fs->nextfs, bp = savebp, address = saveaddress) {
|
||||
for (fu = fs->nextfu; fu; fu = fu->nextfu) {
|
||||
for (fs = fshead, savebp = bp, saveaddress = address; fs;
|
||||
fs = fs->nextfs, bp = savebp, address = saveaddress) {
|
||||
for (fu = fs->nextfu; fu; fu = fu->nextfu) {
|
||||
if (fu->flags & F_IGNORE) {
|
||||
break;
|
||||
}
|
||||
for (cnt = fu->reps; cnt; --cnt) {
|
||||
for (pr = fu->nextpr; pr; address += pr->bcnt,
|
||||
bp += pr->bcnt, pr = pr->nextpr) {
|
||||
if (eaddress && address >= eaddress &&
|
||||
!(pr->flags&(F_TEXT|F_BPAD))) {
|
||||
for (pr = fu->nextpr; pr; address += pr->bcnt,
|
||||
bp += pr->bcnt, pr = pr->nextpr) {
|
||||
if (eaddress && address >= eaddress &&
|
||||
!(pr->flags & (F_TEXT | F_BPAD))) {
|
||||
bpad(pr);
|
||||
}
|
||||
if (cnt == 1 && pr->nospace) {
|
||||
if (cnt == 1 && pr->nospace) {
|
||||
savech = *pr->nospace;
|
||||
*pr->nospace = '\0';
|
||||
}
|
||||
// PRINT;
|
||||
switch(pr->flags) {
|
||||
case F_ADDRESS:
|
||||
printf(pr->fmt, address);
|
||||
break;
|
||||
case F_BPAD:
|
||||
printf(pr->fmt, "");
|
||||
break;
|
||||
case F_C:
|
||||
conv_c(pr, bp);
|
||||
break;
|
||||
case F_CHAR:
|
||||
printf(pr->fmt, *bp);
|
||||
break;
|
||||
case F_DBL: {
|
||||
double dval;
|
||||
float fval;
|
||||
switch(pr->bcnt) {
|
||||
case 4:
|
||||
bcopy((char *)bp, (char *)&fval, sizeof(fval));
|
||||
printf(pr->fmt, fval);
|
||||
break;
|
||||
case 8:
|
||||
bcopy((char *)bp, (char *)&dval, sizeof(dval));
|
||||
printf(pr->fmt, dval);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case F_INT: {
|
||||
int ival;
|
||||
short sval;
|
||||
switch(pr->bcnt) {
|
||||
case 1:
|
||||
printf(pr->fmt, (int)*bp);
|
||||
break;
|
||||
case 2:
|
||||
bcopy((char *)bp, (char *)&sval, sizeof(sval));
|
||||
printf(pr->fmt, (int)sval);
|
||||
break;
|
||||
case 4:
|
||||
bcopy((char *)bp, (char *)&ival, sizeof(ival));
|
||||
printf(pr->fmt, ival);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case F_P:
|
||||
printf(pr->fmt, isprint(*bp) ? *bp : '.');
|
||||
break;
|
||||
case F_STR:
|
||||
printf(pr->fmt, (char *)bp);
|
||||
break;
|
||||
case F_TEXT:
|
||||
printf(pr->fmt);
|
||||
break;
|
||||
case F_U:
|
||||
conv_u(pr, bp);
|
||||
break;
|
||||
case F_UINT: {
|
||||
u_int ival;
|
||||
u_short sval;
|
||||
switch(pr->bcnt) {
|
||||
case 1:
|
||||
printf(pr->fmt, (u_int)*bp);
|
||||
break;
|
||||
case 2:
|
||||
bcopy((char *)bp, (char *)&sval, sizeof(sval));
|
||||
printf(pr->fmt, (u_int)sval);
|
||||
break;
|
||||
case 4:
|
||||
bcopy((char *)bp, (char *)&ival, sizeof(ival));
|
||||
printf(pr->fmt, ival);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (cnt == 1 && pr->nospace) {
|
||||
/* PRINT; */
|
||||
switch (pr->flags) {
|
||||
case F_ADDRESS:
|
||||
printf(pr->fmt, address);
|
||||
break;
|
||||
case F_BPAD:
|
||||
printf(pr->fmt, "");
|
||||
break;
|
||||
case F_C:
|
||||
conv_c(pr, bp);
|
||||
break;
|
||||
case F_CHAR:
|
||||
printf(pr->fmt, *bp);
|
||||
break;
|
||||
case F_DBL:{
|
||||
double dval;
|
||||
float fval;
|
||||
|
||||
switch (pr->bcnt) {
|
||||
case 4:
|
||||
bcopy((char *) bp, (char *) &fval,
|
||||
sizeof(fval));
|
||||
printf(pr->fmt, fval);
|
||||
break;
|
||||
case 8:
|
||||
bcopy((char *) bp, (char *) &dval,
|
||||
sizeof(dval));
|
||||
printf(pr->fmt, dval);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case F_INT:{
|
||||
int ival;
|
||||
short sval;
|
||||
|
||||
switch (pr->bcnt) {
|
||||
case 1:
|
||||
printf(pr->fmt, (int) *bp);
|
||||
break;
|
||||
case 2:
|
||||
bcopy((char *) bp, (char *) &sval,
|
||||
sizeof(sval));
|
||||
printf(pr->fmt, (int) sval);
|
||||
break;
|
||||
case 4:
|
||||
bcopy((char *) bp, (char *) &ival,
|
||||
sizeof(ival));
|
||||
printf(pr->fmt, ival);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case F_P:
|
||||
printf(pr->fmt, isprint(*bp) ? *bp : '.');
|
||||
break;
|
||||
case F_STR:
|
||||
printf(pr->fmt, (char *) bp);
|
||||
break;
|
||||
case F_TEXT:
|
||||
printf(pr->fmt);
|
||||
break;
|
||||
case F_U:
|
||||
conv_u(pr, bp);
|
||||
break;
|
||||
case F_UINT:{
|
||||
u_int ival;
|
||||
u_short sval;
|
||||
|
||||
switch (pr->bcnt) {
|
||||
case 1:
|
||||
printf(pr->fmt, (u_int) * bp);
|
||||
break;
|
||||
case 2:
|
||||
bcopy((char *) bp, (char *) &sval,
|
||||
sizeof(sval));
|
||||
printf(pr->fmt, (u_int) sval);
|
||||
break;
|
||||
case 4:
|
||||
bcopy((char *) bp, (char *) &ival,
|
||||
sizeof(ival));
|
||||
printf(pr->fmt, ival);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (cnt == 1 && pr->nospace) {
|
||||
*pr->nospace = savech;
|
||||
}
|
||||
}
|
||||
@ -672,12 +717,12 @@ void display(void)
|
||||
eaddress = address;
|
||||
}
|
||||
for (pr = endfu->nextpr; pr; pr = pr->nextpr) {
|
||||
switch(pr->flags) {
|
||||
switch (pr->flags) {
|
||||
case F_ADDRESS:
|
||||
(void)printf(pr->fmt, eaddress);
|
||||
(void) printf(pr->fmt, eaddress);
|
||||
break;
|
||||
case F_TEXT:
|
||||
(void)printf(pr->fmt);
|
||||
(void) printf(pr->fmt);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -703,7 +748,7 @@ int dump(char **argv)
|
||||
next(argv);
|
||||
display();
|
||||
|
||||
return(exitval);
|
||||
return (exitval);
|
||||
}
|
||||
|
||||
void add(char *fmt)
|
||||
@ -718,7 +763,7 @@ void add(char *fmt)
|
||||
|
||||
/* start new linked list of format units */
|
||||
/* NOSTRICT */
|
||||
tfs = (FS *)xmalloc(sizeof(FS));
|
||||
tfs = (FS *) xmalloc(sizeof(FS));
|
||||
if (!fshead) {
|
||||
fshead = tfs;
|
||||
} else {
|
||||
@ -737,7 +782,7 @@ void add(char *fmt)
|
||||
|
||||
/* allocate a new format unit and link it in */
|
||||
/* NOSTRICT */
|
||||
tfu = (FU *)xmalloc(sizeof(FU));
|
||||
tfu = (FU *) xmalloc(sizeof(FU));
|
||||
*nextfu = tfu;
|
||||
nextfu = &tfu->nextfu;
|
||||
tfu->reps = 1;
|
||||
@ -785,7 +830,7 @@ void add(char *fmt)
|
||||
}
|
||||
strncpy(tfu->fmt, savep, p - savep);
|
||||
tfu->fmt[p - savep] = '\0';
|
||||
// escape(tfu->fmt);
|
||||
/* escape(tfu->fmt); */
|
||||
|
||||
p1 = tfu->fmt;
|
||||
|
||||
@ -796,9 +841,9 @@ void add(char *fmt)
|
||||
break;
|
||||
}
|
||||
if (*p1 == '\\') {
|
||||
switch(*++p1) {
|
||||
switch (*++p1) {
|
||||
case 'a':
|
||||
/* *p2 = '\a'; */
|
||||
/* *p2 = '\a'; */
|
||||
*p2 = '\007';
|
||||
break;
|
||||
case 'b':
|
||||
@ -829,6 +874,7 @@ void add(char *fmt)
|
||||
p++;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Copyright (c) 1989 The Regents of the University of California.
|
||||
* All rights reserved.
|
||||
|
||||
759
libbb/unzip.c
759
libbb/unzip.c
File diff suppressed because it is too large
Load Diff
5461
shell/ash.c
5461
shell/ash.c
File diff suppressed because it is too large
Load Diff
@ -33,9 +33,9 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <signal.h> /* for our signal() handlers */
|
||||
#include <string.h> /* strncpy() */
|
||||
#include <errno.h> /* errno and friends */
|
||||
#include <signal.h> /* for our signal() handlers */
|
||||
#include <string.h> /* strncpy() */
|
||||
#include <errno.h> /* errno and friends */
|
||||
#include <unistd.h>
|
||||
#include <ctype.h>
|
||||
#include <sys/syslog.h>
|
||||
@ -54,13 +54,13 @@ static void klogd_signal(int sig)
|
||||
{
|
||||
klogctl(7, NULL, 0);
|
||||
klogctl(0, 0, 0);
|
||||
//logMessage(0, "Kernel log daemon exiting.");
|
||||
/* logMessage(0, "Kernel log daemon exiting."); */
|
||||
syslog_msg(LOG_DAEMON, 0, "Kernel log daemon exiting.");
|
||||
exit(TRUE);
|
||||
}
|
||||
|
||||
static void doKlogd (void) __attribute__ ((noreturn));
|
||||
static void doKlogd (void)
|
||||
static void doKlogd(void) __attribute__ ((noreturn));
|
||||
static void doKlogd(void)
|
||||
{
|
||||
int priority = LOG_INFO;
|
||||
char log_buffer[4096];
|
||||
@ -87,30 +87,32 @@ static void doKlogd (void)
|
||||
|
||||
if (errno == EINTR)
|
||||
continue;
|
||||
snprintf(message, 79, "klogd: Error return from sys_sycall: %d - %s.\n",
|
||||
errno, strerror(errno));
|
||||
snprintf(message, 79,
|
||||
"klogd: Error return from sys_sycall: %d - %s.\n", errno,
|
||||
strerror(errno));
|
||||
syslog_msg(LOG_DAEMON, LOG_SYSLOG | LOG_ERR, message);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
/* klogctl buffer parsing modelled after code in dmesg.c */
|
||||
start=&log_buffer[0];
|
||||
lastc='\0';
|
||||
for (i=0; i<n; i++) {
|
||||
start = &log_buffer[0];
|
||||
lastc = '\0';
|
||||
for (i = 0; i < n; i++) {
|
||||
if (lastc == '\0' && log_buffer[i] == '<') {
|
||||
priority = 0;
|
||||
i++;
|
||||
while (isdigit(log_buffer[i])) {
|
||||
priority = priority*10+(log_buffer[i]-'0');
|
||||
priority = priority * 10 + (log_buffer[i] - '0');
|
||||
i++;
|
||||
}
|
||||
if (log_buffer[i] == '>') i++;
|
||||
if (log_buffer[i] == '>')
|
||||
i++;
|
||||
start = &log_buffer[i];
|
||||
}
|
||||
if (log_buffer[i] == '\n') {
|
||||
log_buffer[i] = '\0'; /* zero terminate this message */
|
||||
log_buffer[i] = '\0'; /* zero terminate this message */
|
||||
syslog_msg(LOG_DAEMON, LOG_KERN | priority, start);
|
||||
start = &log_buffer[i+1];
|
||||
start = &log_buffer[i + 1];
|
||||
priority = LOG_INFO;
|
||||
}
|
||||
lastc = log_buffer[i];
|
||||
@ -127,11 +129,11 @@ extern int klogd_main(int argc, char **argv)
|
||||
/* do normal option parsing */
|
||||
while ((opt = getopt(argc, argv, "n")) > 0) {
|
||||
switch (opt) {
|
||||
case 'n':
|
||||
doFork = FALSE;
|
||||
break;
|
||||
default:
|
||||
show_usage();
|
||||
case 'n':
|
||||
doFork = FALSE;
|
||||
break;
|
||||
default:
|
||||
show_usage();
|
||||
}
|
||||
}
|
||||
|
||||
@ -140,11 +142,11 @@ extern int klogd_main(int argc, char **argv)
|
||||
if (daemon(0, 1) < 0)
|
||||
perror_msg_and_die("daemon");
|
||||
#else
|
||||
error_msg_and_die("daemon not supported");
|
||||
error_msg_and_die("daemon not supported");
|
||||
#endif
|
||||
}
|
||||
doKlogd();
|
||||
|
||||
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
@ -54,24 +54,24 @@
|
||||
#include <ctype.h>
|
||||
#include "busybox.h"
|
||||
#if defined CONFIG_FEATURE_USE_DEVPS_PATCH
|
||||
# include <linux/devmtab.h> /* For Erik's nifty devmtab device driver */
|
||||
# include <linux/devmtab.h> /* For Erik's nifty devmtab device driver */
|
||||
#endif
|
||||
|
||||
enum {
|
||||
MS_MGC_VAL = 0xc0ed0000, /* Magic number indicatng "new" flags */
|
||||
MS_RDONLY = 1, /* Mount read-only */
|
||||
MS_NOSUID = 2, /* Ignore suid and sgid bits */
|
||||
MS_NODEV = 4, /* Disallow access to device special files */
|
||||
MS_NOEXEC = 8, /* Disallow program execution */
|
||||
MS_SYNCHRONOUS = 16, /* Writes are synced at once */
|
||||
MS_REMOUNT = 32, /* Alter flags of a mounted FS */
|
||||
MS_MANDLOCK = 64, /* Allow mandatory locks on an FS */
|
||||
S_QUOTA = 128, /* Quota initialized for file/directory/symlink */
|
||||
S_APPEND = 256, /* Append-only file */
|
||||
S_IMMUTABLE = 512, /* Immutable file */
|
||||
MS_NOATIME = 1024, /* Do not update access times. */
|
||||
MS_NODIRATIME = 2048, /* Do not update directory access times */
|
||||
MS_BIND = 4096, /* Use the new linux 2.4.x "mount --bind" feature */
|
||||
MS_MGC_VAL = 0xc0ed0000, /* Magic number indicatng "new" flags */
|
||||
MS_RDONLY = 1, /* Mount read-only */
|
||||
MS_NOSUID = 2, /* Ignore suid and sgid bits */
|
||||
MS_NODEV = 4, /* Disallow access to device special files */
|
||||
MS_NOEXEC = 8, /* Disallow program execution */
|
||||
MS_SYNCHRONOUS = 16, /* Writes are synced at once */
|
||||
MS_REMOUNT = 32, /* Alter flags of a mounted FS */
|
||||
MS_MANDLOCK = 64, /* Allow mandatory locks on an FS */
|
||||
S_QUOTA = 128, /* Quota initialized for file/directory/symlink */
|
||||
S_APPEND = 256, /* Append-only file */
|
||||
S_IMMUTABLE = 512, /* Immutable file */
|
||||
MS_NOATIME = 1024, /* Do not update access times. */
|
||||
MS_NODIRATIME = 2048, /* Do not update directory access times */
|
||||
MS_BIND = 4096, /* Use the new linux 2.4.x "mount --bind" feature */
|
||||
};
|
||||
|
||||
|
||||
@ -81,13 +81,13 @@ enum {
|
||||
static int use_loop = FALSE;
|
||||
#endif
|
||||
|
||||
extern int mount (__const char *__special_file, __const char *__dir,
|
||||
__const char *__fstype, unsigned long int __rwflag,
|
||||
__const void *__data);
|
||||
extern int umount (__const char *__special_file);
|
||||
extern int umount2 (__const char *__special_file, int __flags);
|
||||
extern int mount(__const char *__special_file, __const char *__dir,
|
||||
__const char *__fstype, unsigned long int __rwflag,
|
||||
__const void *__data);
|
||||
extern int umount(__const char *__special_file);
|
||||
extern int umount2(__const char *__special_file, int __flags);
|
||||
|
||||
extern int sysfs( int option, unsigned int fs_index, char * buf);
|
||||
extern int sysfs(int option, unsigned int fs_index, char *buf);
|
||||
|
||||
extern const char mtab_file[]; /* Defined in utility.c */
|
||||
|
||||
@ -125,16 +125,16 @@ do_mount(char *specialfile, char *dir, char *filesystemtype,
|
||||
char *mtab_opts, int mount_all)
|
||||
{
|
||||
int status = 0;
|
||||
|
||||
#if defined CONFIG_FEATURE_MOUNT_LOOP
|
||||
char *lofile = NULL;
|
||||
#endif
|
||||
|
||||
if (! fakeIt)
|
||||
{
|
||||
if (!fakeIt) {
|
||||
#if defined CONFIG_FEATURE_MOUNT_LOOP
|
||||
if (use_loop==TRUE) {
|
||||
if (use_loop == TRUE) {
|
||||
int loro = flags & MS_RDONLY;
|
||||
|
||||
|
||||
lofile = specialfile;
|
||||
|
||||
specialfile = find_unused_loop_device();
|
||||
@ -152,8 +152,10 @@ do_mount(char *specialfile, char *dir, char *filesystemtype,
|
||||
#endif
|
||||
status = mount(specialfile, dir, filesystemtype, flags, string_flags);
|
||||
if (status < 0 && errno == EROFS) {
|
||||
error_msg("%s is write-protected, mounting read-only", specialfile);
|
||||
status = mount(specialfile, dir, filesystemtype, flags |= MS_RDONLY, string_flags);
|
||||
error_msg("%s is write-protected, mounting read-only",
|
||||
specialfile);
|
||||
status = mount(specialfile, dir, filesystemtype, flags |=
|
||||
MS_RDONLY, string_flags);
|
||||
}
|
||||
/* Don't whine about already mounted filesystems when mounting all. */
|
||||
if (status < 0 && errno == EBUSY && mount_all)
|
||||
@ -162,11 +164,11 @@ do_mount(char *specialfile, char *dir, char *filesystemtype,
|
||||
|
||||
|
||||
/* If the mount was sucessful, do anything needed, then return TRUE */
|
||||
if (status == 0 || fakeIt==TRUE) {
|
||||
if (status == 0 || fakeIt == TRUE) {
|
||||
|
||||
#if defined CONFIG_FEATURE_MTAB_SUPPORT
|
||||
if (useMtab) {
|
||||
erase_mtab(specialfile); // Clean any stale entries
|
||||
erase_mtab(specialfile); /* Clean any stale entries */
|
||||
write_mtab(specialfile, dir, filesystemtype, flags, mtab_opts);
|
||||
}
|
||||
#endif
|
||||
@ -190,13 +192,12 @@ do_mount(char *specialfile, char *dir, char *filesystemtype,
|
||||
|
||||
static void paste_str(char **s1, const char *s2)
|
||||
{
|
||||
*s1 = xrealloc(*s1, strlen(*s1)+strlen(s2)+1);
|
||||
*s1 = xrealloc(*s1, strlen(*s1) + strlen(s2) + 1);
|
||||
strcat(*s1, s2);
|
||||
}
|
||||
|
||||
/* Seperate standard mount options from the nonstandard string options */
|
||||
static void
|
||||
parse_mount_options(char *options, int *flags, char **strflags)
|
||||
static void parse_mount_options(char *options, int *flags, char **strflags)
|
||||
{
|
||||
while (options) {
|
||||
int gotone = FALSE;
|
||||
@ -217,13 +218,13 @@ parse_mount_options(char *options, int *flags, char **strflags)
|
||||
f++;
|
||||
}
|
||||
#if defined CONFIG_FEATURE_MOUNT_LOOP
|
||||
if (!strcasecmp("loop", options)) { /* loop device support */
|
||||
if (!strcasecmp("loop", options)) { /* loop device support */
|
||||
use_loop = TRUE;
|
||||
gotone = TRUE;
|
||||
}
|
||||
#endif
|
||||
if (! gotone) {
|
||||
if (**strflags) /* have previous parsed options */
|
||||
if (!gotone) {
|
||||
if (**strflags) /* have previous parsed options */
|
||||
paste_str(strflags, ",");
|
||||
paste_str(strflags, options);
|
||||
}
|
||||
@ -245,81 +246,85 @@ mount_one(char *blockDevice, char *directory, char *filesystemType,
|
||||
|
||||
#if defined CONFIG_FEATURE_USE_DEVPS_PATCH
|
||||
if (strcmp(filesystemType, "auto") == 0) {
|
||||
static const char *noauto_array[] = { "tmpfs", "shm", "proc", "ramfs", "devpts", "devfs", "usbdevfs", 0 };
|
||||
static const char *noauto_array[] =
|
||||
{ "tmpfs", "shm", "proc", "ramfs", "devpts", "devfs", "usbdevfs",
|
||||
0 };
|
||||
const char **noauto_fstype;
|
||||
const int num_of_filesystems = sysfs(3, 0, 0);
|
||||
char buf[255];
|
||||
int i=0;
|
||||
int i = 0;
|
||||
|
||||
filesystemType=buf;
|
||||
filesystemType = buf;
|
||||
|
||||
while(i < num_of_filesystems) {
|
||||
while (i < num_of_filesystems) {
|
||||
sysfs(2, i++, filesystemType);
|
||||
for (noauto_fstype = noauto_array; *noauto_fstype; noauto_fstype++) {
|
||||
for (noauto_fstype = noauto_array; *noauto_fstype;
|
||||
noauto_fstype++) {
|
||||
if (!strcmp(filesystemType, *noauto_fstype)) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!*noauto_fstype) {
|
||||
status = do_mount(blockDevice, directory, filesystemType,
|
||||
flags | MS_MGC_VAL, string_flags,
|
||||
useMtab, fakeIt, mtab_opts, mount_all);
|
||||
flags | MS_MGC_VAL, string_flags,
|
||||
useMtab, fakeIt, mtab_opts, mount_all);
|
||||
if (status)
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#else
|
||||
if (strcmp(filesystemType, "auto") == 0) {
|
||||
char buf[255];
|
||||
FILE *f;
|
||||
int read_proc = 0;
|
||||
|
||||
f = fopen ( "/etc/filesystems", "r" );
|
||||
|
||||
if ( f ) {
|
||||
while ( fgets ( buf, sizeof( buf ), f )) {
|
||||
if ( *buf == '*' )
|
||||
|
||||
f = fopen("/etc/filesystems", "r");
|
||||
|
||||
if (f) {
|
||||
while (fgets(buf, sizeof(buf), f)) {
|
||||
if (*buf == '*')
|
||||
read_proc = 1;
|
||||
else if ( *buf == '#' )
|
||||
else if (*buf == '#')
|
||||
continue;
|
||||
else {
|
||||
filesystemType = buf;
|
||||
|
||||
// Add NULL termination to each line
|
||||
while (*filesystemType && !isspace ( *filesystemType ))
|
||||
|
||||
/* Add NULL termination to each line */
|
||||
while (*filesystemType && !isspace(*filesystemType))
|
||||
filesystemType++;
|
||||
*filesystemType = '\0';
|
||||
|
||||
filesystemType = buf;
|
||||
|
||||
if ( xstrlen ( filesystemType )) {
|
||||
status = do_mount(blockDevice, directory, filesystemType,
|
||||
flags | MS_MGC_VAL, string_flags,
|
||||
useMtab, fakeIt, mtab_opts, mount_all);
|
||||
|
||||
if (xstrlen(filesystemType)) {
|
||||
status =
|
||||
do_mount(blockDevice, directory, filesystemType,
|
||||
flags | MS_MGC_VAL, string_flags,
|
||||
useMtab, fakeIt, mtab_opts, mount_all);
|
||||
if (status)
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
fclose ( f );
|
||||
}
|
||||
fclose(f);
|
||||
}
|
||||
|
||||
if (( !f || read_proc ) && !status ) {
|
||||
if ((!f || read_proc) && !status) {
|
||||
f = xfopen("/proc/filesystems", "r");
|
||||
|
||||
while (fgets(buf, sizeof(buf), f) != NULL) {
|
||||
filesystemType = buf;
|
||||
if (*filesystemType == '\t') { // Not a nodev filesystem
|
||||
|
||||
// Add NULL termination to each line
|
||||
if (*filesystemType == '\t') { /* Not a nodev filesystem */
|
||||
|
||||
/* Add NULL termination to each line */
|
||||
while (*filesystemType && *filesystemType != '\n')
|
||||
filesystemType++;
|
||||
*filesystemType = '\0';
|
||||
|
||||
filesystemType = buf;
|
||||
filesystemType++; // hop past tab
|
||||
filesystemType++; /* hop past tab */
|
||||
|
||||
status = do_mount(blockDevice, directory, filesystemType,
|
||||
flags | MS_MGC_VAL, string_flags,
|
||||
@ -334,11 +339,11 @@ mount_one(char *blockDevice, char *directory, char *filesystemType,
|
||||
#endif
|
||||
else {
|
||||
status = do_mount(blockDevice, directory, filesystemType,
|
||||
flags | MS_MGC_VAL, string_flags, useMtab,
|
||||
fakeIt, mtab_opts, mount_all);
|
||||
flags | MS_MGC_VAL, string_flags, useMtab,
|
||||
fakeIt, mtab_opts, mount_all);
|
||||
}
|
||||
|
||||
if (! status) {
|
||||
if (!status) {
|
||||
if (whineOnErrors) {
|
||||
perror_msg("Mounting %s on %s failed", blockDevice, directory);
|
||||
}
|
||||
@ -354,34 +359,35 @@ static void show_mounts(char *onlytype)
|
||||
char device[] = "/dev/mtab";
|
||||
struct k_mntent *mntentlist;
|
||||
|
||||
/* open device */
|
||||
/* open device */
|
||||
fd = open(device, O_RDONLY);
|
||||
if (fd < 0)
|
||||
perror_msg_and_die("open failed for `%s'", device);
|
||||
|
||||
/* How many mounted filesystems? We need to know to
|
||||
* allocate enough space for later... */
|
||||
numfilesystems = ioctl (fd, DEVMTAB_COUNT_MOUNTS);
|
||||
if (numfilesystems<0)
|
||||
perror_msg_and_die( "\nDEVMTAB_COUNT_MOUNTS");
|
||||
mntentlist = (struct k_mntent *) xcalloc ( numfilesystems, sizeof(struct k_mntent));
|
||||
|
||||
/* Grab the list of mounted filesystems */
|
||||
if (ioctl (fd, DEVMTAB_GET_MOUNTS, mntentlist)<0)
|
||||
perror_msg_and_die( "\nDEVMTAB_GET_MOUNTS");
|
||||
numfilesystems = ioctl(fd, DEVMTAB_COUNT_MOUNTS);
|
||||
if (numfilesystems < 0)
|
||||
perror_msg_and_die("\nDEVMTAB_COUNT_MOUNTS");
|
||||
mntentlist =
|
||||
(struct k_mntent *) xcalloc(numfilesystems, sizeof(struct k_mntent));
|
||||
|
||||
for( i = 0 ; i < numfilesystems ; i++) {
|
||||
if ( !onlytype || ( strcmp ( mntentlist[i].mnt_type, onlytype ) == 0 )) {
|
||||
printf( "%s %s %s %s %d %d\n", mntentlist[i].mnt_fsname,
|
||||
mntentlist[i].mnt_dir, mntentlist[i].mnt_type,
|
||||
mntentlist[i].mnt_opts, mntentlist[i].mnt_freq,
|
||||
mntentlist[i].mnt_passno);
|
||||
/* Grab the list of mounted filesystems */
|
||||
if (ioctl(fd, DEVMTAB_GET_MOUNTS, mntentlist) < 0)
|
||||
perror_msg_and_die("\nDEVMTAB_GET_MOUNTS");
|
||||
|
||||
for (i = 0; i < numfilesystems; i++) {
|
||||
if (!onlytype || (strcmp(mntentlist[i].mnt_type, onlytype) == 0)) {
|
||||
printf("%s %s %s %s %d %d\n", mntentlist[i].mnt_fsname,
|
||||
mntentlist[i].mnt_dir, mntentlist[i].mnt_type,
|
||||
mntentlist[i].mnt_opts, mntentlist[i].mnt_freq,
|
||||
mntentlist[i].mnt_passno);
|
||||
}
|
||||
}
|
||||
#ifdef CONFIG_FEATURE_CLEAN_UP
|
||||
/* Don't bother to close files or free memory. Exit
|
||||
* does that automagically, so we can save a few bytes */
|
||||
free( mntentlist);
|
||||
free(mntentlist);
|
||||
close(fd);
|
||||
#endif
|
||||
exit(EXIT_SUCCESS);
|
||||
@ -393,15 +399,16 @@ static void show_mounts(char *onlytype)
|
||||
|
||||
while ((m = getmntent(mountTable)) != 0) {
|
||||
char *blockDevice = m->mnt_fsname;
|
||||
|
||||
if (strcmp(blockDevice, "/dev/root") == 0) {
|
||||
blockDevice = find_real_root_device_name(blockDevice);
|
||||
}
|
||||
if ( !onlytype || ( strcmp ( m-> mnt_type, onlytype ) == 0 )) {
|
||||
if (!onlytype || (strcmp(m->mnt_type, onlytype) == 0)) {
|
||||
printf("%s on %s type %s (%s)\n", blockDevice, m->mnt_dir,
|
||||
m->mnt_type, m->mnt_opts);
|
||||
}
|
||||
#ifdef CONFIG_FEATURE_CLEAN_UP
|
||||
if(blockDevice != m->mnt_fsname)
|
||||
if (blockDevice != m->mnt_fsname)
|
||||
free(blockDevice);
|
||||
#endif
|
||||
}
|
||||
@ -459,7 +466,7 @@ extern int mount_main(int argc, char **argv)
|
||||
break;
|
||||
#endif
|
||||
case 'v':
|
||||
break; /* ignore -v */
|
||||
break; /* ignore -v */
|
||||
}
|
||||
}
|
||||
|
||||
@ -470,6 +477,7 @@ extern int mount_main(int argc, char **argv)
|
||||
/* if device is a filename get its real path */
|
||||
if (stat(argv[optind], &statbuf) == 0) {
|
||||
char *tmp = simplify_path(argv[optind]);
|
||||
|
||||
safe_strncpy(device, tmp, PATH_MAX);
|
||||
} else {
|
||||
safe_strncpy(device, argv[optind], PATH_MAX);
|
||||
@ -483,59 +491,61 @@ extern int mount_main(int argc, char **argv)
|
||||
f = setmntent("/etc/fstab", "r");
|
||||
|
||||
if (f == NULL)
|
||||
perror_msg_and_die( "\nCannot read /etc/fstab");
|
||||
perror_msg_and_die("\nCannot read /etc/fstab");
|
||||
|
||||
while ((m = getmntent(f)) != NULL) {
|
||||
if (! all && optind + 1 == argc && (
|
||||
(strcmp(device, m->mnt_fsname) != 0) &&
|
||||
(strcmp(device, m->mnt_dir) != 0) ) ) {
|
||||
if (!all && optind + 1 == argc && ((strcmp(device, m->mnt_fsname)
|
||||
!= 0)
|
||||
&& (strcmp(device, m->mnt_dir)
|
||||
!= 0))) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (all && ( // If we're mounting 'all'
|
||||
(strstr(m->mnt_opts, "noauto")) || // and the file system isn't noauto,
|
||||
(strstr(m->mnt_type, "swap")) || // and isn't swap or nfs, then mount it
|
||||
(strstr(m->mnt_type, "nfs")) ) ) {
|
||||
|
||||
if (all && ( /* If we're mounting 'all' */
|
||||
(strstr(m->mnt_opts, "noauto")) || /* and the file system isn't noauto, */
|
||||
(strstr(m->mnt_type, "swap")) || /* and isn't swap or nfs, then mount it */
|
||||
(strstr(m->mnt_type, "nfs")))) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (all || flags == 0) { // Allow single mount to override fstab flags
|
||||
|
||||
if (all || flags == 0) { /* Allow single mount to override fstab flags */
|
||||
flags = 0;
|
||||
string_flags[0] = 0;
|
||||
parse_mount_options(m->mnt_opts, &flags, &string_flags);
|
||||
}
|
||||
|
||||
|
||||
strcpy(device, m->mnt_fsname);
|
||||
strcpy(directory, m->mnt_dir);
|
||||
filesystemType = xstrdup(m->mnt_type);
|
||||
singlemount:
|
||||
singlemount:
|
||||
extra_opts = string_flags;
|
||||
rc = EXIT_SUCCESS;
|
||||
#ifdef CONFIG_NFSMOUNT
|
||||
if (strchr(device, ':') != NULL) {
|
||||
filesystemType = "nfs";
|
||||
if (nfsmount (device, directory, &flags, &extra_opts,
|
||||
&string_flags, 1)) {
|
||||
if (nfsmount(device, directory, &flags, &extra_opts,
|
||||
&string_flags, 1)) {
|
||||
perror_msg("nfsmount failed");
|
||||
rc = EXIT_FAILURE;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
if (!mount_one(device, directory, filesystemType, flags,
|
||||
string_flags, useMtab, fakeIt, extra_opts, TRUE, all))
|
||||
string_flags, useMtab, fakeIt, extra_opts, TRUE,
|
||||
all))
|
||||
rc = EXIT_FAILURE;
|
||||
|
||||
if (! all)
|
||||
|
||||
if (!all)
|
||||
break;
|
||||
}
|
||||
if (f)
|
||||
endmntent(f);
|
||||
|
||||
if (! all && f && m == NULL)
|
||||
|
||||
if (!all && f && m == NULL)
|
||||
fprintf(stderr, "Can't find %s in /etc/fstab\n", device);
|
||||
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
||||
goto singlemount;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user