mirror of
https://github.com/sheumann/hush.git
synced 2024-07-15 15:29:07 +00:00
Run through indent, fix comments
This commit is contained in:
Glenn L McGrath
parent
7c58e9be69
commit
9fef17dec3
@ -115,7 +115,7 @@ static const unsigned short mask_bits[] = {
|
||||
0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff
|
||||
};
|
||||
|
||||
//static int error_number = 0;
|
||||
/* static int error_number = 0; */
|
||||
/* ========================================================================
|
||||
* Signal and error handler.
|
||||
*/
|
||||
@ -145,7 +145,9 @@ static void make_crc_table(void)
|
||||
* zero was stolen from Haruhiko Okumura's ar002
|
||||
*/
|
||||
for (k = 8; k; k--) {
|
||||
table_entry = table_entry & 1 ? (table_entry >> 1) ^ poly : table_entry >> 1;
|
||||
table_entry =
|
||||
table_entry & 1 ? (table_entry >> 1) ^ poly : table_entry >>
|
||||
1;
|
||||
}
|
||||
crc_table[i] = table_entry;
|
||||
}
|
||||
@ -209,8 +211,9 @@ typedef unsigned char extra_bits_t;
|
||||
* t: result: starting table
|
||||
* m: maximum lookup bits, returns actual
|
||||
*/
|
||||
static int huft_build(unsigned int *b, const unsigned int n, const unsigned int s,
|
||||
const unsigned short *d, const extra_bits_t *e, huft_t **t, int *m)
|
||||
static int huft_build(unsigned int *b, const unsigned int n,
|
||||
const unsigned int s, const unsigned short *d,
|
||||
const extra_bits_t * e, huft_t ** t, int *m)
|
||||
{
|
||||
unsigned a; /* counter for codes of length k */
|
||||
unsigned c[BMAX + 1]; /* bit length count table */
|
||||
@ -413,14 +416,14 @@ static int inflate_codes(huft_t *tl, huft_t *td, int bl, int bd)
|
||||
b |= ((unsigned long) fgetc(in_file)) << k;
|
||||
k += 8;
|
||||
}
|
||||
} while ((e = (t = t->v.t + ((unsigned) b & mask_bits[e]))->e) > 16);
|
||||
} while ((e =
|
||||
(t = t->v.t + ((unsigned) b & mask_bits[e]))->e) > 16);
|
||||
b >>= t->b;
|
||||
k -= t->b;
|
||||
if (e == 16) { /* then it's a literal */
|
||||
window[w++] = (unsigned char) t->v.n;
|
||||
if (w == WSIZE) {
|
||||
outcnt=(w),
|
||||
flush_window();
|
||||
outcnt = (w), flush_window();
|
||||
w = 0;
|
||||
}
|
||||
} else { /* it's an EOB or a length */
|
||||
@ -456,7 +459,9 @@ static int inflate_codes(huft_t *tl, huft_t *td, int bl, int bd)
|
||||
b |= ((unsigned long) fgetc(in_file)) << k;
|
||||
k += 8;
|
||||
}
|
||||
} while ((e = (t = t->v.t + ((unsigned) b & mask_bits[e]))->e) > 16);
|
||||
} while ((e =
|
||||
(t =
|
||||
t->v.t + ((unsigned) b & mask_bits[e]))->e) > 16);
|
||||
b >>= t->b;
|
||||
k -= t->b;
|
||||
while (k < e) {
|
||||
@ -469,7 +474,9 @@ static int inflate_codes(huft_t *tl, huft_t *td, int bl, int bd)
|
||||
|
||||
/* do the copy */
|
||||
do {
|
||||
n -= (e = (e = WSIZE - ((d &= WSIZE - 1) > w ? d : w)) > n ? n : e);
|
||||
n -= (e =
|
||||
(e =
|
||||
WSIZE - ((d &= WSIZE - 1) > w ? d : w)) > n ? n : e);
|
||||
#if !defined(NOMEMCPY) && !defined(DEBUG)
|
||||
if (w - d >= e) { /* (this test assumes unsigned comparison) */
|
||||
memcpy(window + w, window + d, e);
|
||||
@ -481,8 +488,7 @@ static int inflate_codes(huft_t *tl, huft_t *td, int bl, int bd)
|
||||
window[w++] = window[d++];
|
||||
} while (--e);
|
||||
if (w == WSIZE) {
|
||||
outcnt=(w),
|
||||
flush_window();
|
||||
outcnt = (w), flush_window();
|
||||
w = 0;
|
||||
}
|
||||
} while (n);
|
||||
@ -502,6 +508,7 @@ static const unsigned short cplens[] = { /* Copy lengths for literal codes 2
|
||||
3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
|
||||
35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0
|
||||
};
|
||||
|
||||
/* note: see note #13 above about the 258 in this list. */
|
||||
static const extra_bits_t cplext[] = { /* Extra bits for literal codes 257..285 */
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
|
||||
@ -517,6 +524,7 @@ static const extra_bits_t cpdext[] = { /* Extra bits for distance codes */
|
||||
7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
|
||||
12, 12, 13, 13
|
||||
};
|
||||
|
||||
/* Tables for deflate from PKZIP's appnote.txt. */
|
||||
static const extra_bits_t border[] = { /* Order of the bit length code lengths */
|
||||
16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
|
||||
@ -605,8 +613,7 @@ static int inflate_block(int *e)
|
||||
}
|
||||
window[w++] = (unsigned char) b_stored;
|
||||
if (w == (unsigned long) WSIZE) {
|
||||
outcnt=(w),
|
||||
flush_window();
|
||||
outcnt = (w), flush_window();
|
||||
w = 0;
|
||||
}
|
||||
b_stored >>= 8;
|
||||
@ -759,10 +766,10 @@ static int inflate_block(int *e)
|
||||
j = td->v.n;
|
||||
if (j < 16) { /* length of code in bits (0..15) */
|
||||
ll[i++] = l = j; /* save last length in l */
|
||||
}
|
||||
else if (j == 16) { /* repeat last length 3 to 6 times */
|
||||
} else if (j == 16) { /* repeat last length 3 to 6 times */
|
||||
while (k_dynamic < 2) {
|
||||
b_dynamic |= ((unsigned long)fgetc(in_file)) << k_dynamic;
|
||||
b_dynamic |=
|
||||
((unsigned long) fgetc(in_file)) << k_dynamic;
|
||||
k_dynamic += 8;
|
||||
}
|
||||
j = 3 + ((unsigned) b_dynamic & 3);
|
||||
@ -776,7 +783,8 @@ static int inflate_block(int *e)
|
||||
}
|
||||
} else if (j == 17) { /* 3 to 10 zero length codes */
|
||||
while (k_dynamic < 3) {
|
||||
b_dynamic |= ((unsigned long)fgetc(in_file)) << k_dynamic;
|
||||
b_dynamic |=
|
||||
((unsigned long) fgetc(in_file)) << k_dynamic;
|
||||
k_dynamic += 8;
|
||||
}
|
||||
j = 3 + ((unsigned) b_dynamic & 7);
|
||||
@ -791,7 +799,8 @@ static int inflate_block(int *e)
|
||||
l = 0;
|
||||
} else { /* j == 18: 11 to 138 zero length codes */
|
||||
while (k_dynamic < 7) {
|
||||
b_dynamic |= ((unsigned long)fgetc(in_file)) << k_dynamic;
|
||||
b_dynamic |=
|
||||
((unsigned long) fgetc(in_file)) << k_dynamic;
|
||||
k_dynamic += 8;
|
||||
}
|
||||
j = 11 + ((unsigned) b_dynamic & 0x7f);
|
||||
@ -921,11 +930,6 @@ extern int unzip(FILE *l_in_file, FILE *l_out_file)
|
||||
if (signal(SIGINT, SIG_IGN) != SIG_IGN) {
|
||||
(void) signal(SIGINT, (sig_type) abort_gzip);
|
||||
}
|
||||
#ifdef SIGTERM
|
||||
// if (signal(SIGTERM, SIG_IGN) != SIG_IGN) {
|
||||
// (void) signal(SIGTERM, (sig_type) abort_gzip);
|
||||
// }
|
||||
#endif
|
||||
#ifdef SIGHUP
|
||||
if (signal(SIGHUP, SIG_IGN) != SIG_IGN) {
|
||||
(void) signal(SIGHUP, (sig_type) abort_gzip);
|
||||
@ -963,7 +967,8 @@ extern int unzip(FILE *l_in_file, FILE *l_out_file)
|
||||
|
||||
if (flags & 0x04) {
|
||||
/* bit 2 set: extra field present */
|
||||
const unsigned short extra = fgetc(l_in_file) + (fgetc(l_in_file) << 8);
|
||||
const unsigned short extra =
|
||||
fgetc(l_in_file) + (fgetc(l_in_file) << 8);
|
||||
|
||||
for (i = 0; i < extra; i++) {
|
||||
fgetc(l_in_file);
|
||||
@ -994,11 +999,14 @@ extern int unzip(FILE *l_in_file, FILE *l_out_file)
|
||||
fread(buf, 1, 8, l_in_file);
|
||||
|
||||
/* Validate decompression - crc */
|
||||
if ((unsigned int)((buf[0] | (buf[1] << 8)) |((buf[2] | (buf[3] << 8)) << 16)) != (crc ^ 0xffffffffL)) {
|
||||
if ((unsigned int) ((buf[0] | (buf[1] << 8)) |
|
||||
((buf[2] | (buf[3] << 8)) << 16)) !=
|
||||
(crc ^ 0xffffffffL)) {
|
||||
error_msg("invalid compressed data--crc error");
|
||||
}
|
||||
/* Validate decompression - size */
|
||||
if (((buf[4] | (buf[5] << 8)) |((buf[6] | (buf[7] << 8)) << 16)) != (unsigned long) bytes_out) {
|
||||
if (((buf[4] | (buf[5] << 8)) | ((buf[6] | (buf[7] << 8)) << 16)) !=
|
||||
(unsigned long) bytes_out) {
|
||||
error_msg("invalid compressed data--length error");
|
||||
}
|
||||
|
||||
@ -1011,7 +1019,8 @@ extern int unzip(FILE *l_in_file, FILE *l_out_file)
|
||||
extern void gz_close(int gunzip_pid)
|
||||
{
|
||||
if (kill(gunzip_pid, SIGTERM) == -1) {
|
||||
error_msg_and_die("*** Couldnt kill old gunzip process *** aborting");
|
||||
error_msg_and_die
|
||||
("*** Couldnt kill old gunzip process *** aborting");
|
||||
}
|
||||
|
||||
if (waitpid(gunzip_pid, NULL, 0) == -1) {
|
||||
|
||||
@ -115,7 +115,7 @@ static const unsigned short mask_bits[] = {
|
||||
0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff
|
||||
};
|
||||
|
||||
//static int error_number = 0;
|
||||
/* static int error_number = 0; */
|
||||
/* ========================================================================
|
||||
* Signal and error handler.
|
||||
*/
|
||||
@ -145,7 +145,9 @@ static void make_crc_table(void)
|
||||
* zero was stolen from Haruhiko Okumura's ar002
|
||||
*/
|
||||
for (k = 8; k; k--) {
|
||||
table_entry = table_entry & 1 ? (table_entry >> 1) ^ poly : table_entry >> 1;
|
||||
table_entry =
|
||||
table_entry & 1 ? (table_entry >> 1) ^ poly : table_entry >>
|
||||
1;
|
||||
}
|
||||
crc_table[i] = table_entry;
|
||||
}
|
||||
@ -209,8 +211,9 @@ typedef unsigned char extra_bits_t;
|
||||
* t: result: starting table
|
||||
* m: maximum lookup bits, returns actual
|
||||
*/
|
||||
static int huft_build(unsigned int *b, const unsigned int n, const unsigned int s,
|
||||
const unsigned short *d, const extra_bits_t *e, huft_t **t, int *m)
|
||||
static int huft_build(unsigned int *b, const unsigned int n,
|
||||
const unsigned int s, const unsigned short *d,
|
||||
const extra_bits_t * e, huft_t ** t, int *m)
|
||||
{
|
||||
unsigned a; /* counter for codes of length k */
|
||||
unsigned c[BMAX + 1]; /* bit length count table */
|
||||
@ -413,14 +416,14 @@ static int inflate_codes(huft_t *tl, huft_t *td, int bl, int bd)
|
||||
b |= ((unsigned long) fgetc(in_file)) << k;
|
||||
k += 8;
|
||||
}
|
||||
} while ((e = (t = t->v.t + ((unsigned) b & mask_bits[e]))->e) > 16);
|
||||
} while ((e =
|
||||
(t = t->v.t + ((unsigned) b & mask_bits[e]))->e) > 16);
|
||||
b >>= t->b;
|
||||
k -= t->b;
|
||||
if (e == 16) { /* then it's a literal */
|
||||
window[w++] = (unsigned char) t->v.n;
|
||||
if (w == WSIZE) {
|
||||
outcnt=(w),
|
||||
flush_window();
|
||||
outcnt = (w), flush_window();
|
||||
w = 0;
|
||||
}
|
||||
} else { /* it's an EOB or a length */
|
||||
@ -456,7 +459,9 @@ static int inflate_codes(huft_t *tl, huft_t *td, int bl, int bd)
|
||||
b |= ((unsigned long) fgetc(in_file)) << k;
|
||||
k += 8;
|
||||
}
|
||||
} while ((e = (t = t->v.t + ((unsigned) b & mask_bits[e]))->e) > 16);
|
||||
} while ((e =
|
||||
(t =
|
||||
t->v.t + ((unsigned) b & mask_bits[e]))->e) > 16);
|
||||
b >>= t->b;
|
||||
k -= t->b;
|
||||
while (k < e) {
|
||||
@ -469,7 +474,9 @@ static int inflate_codes(huft_t *tl, huft_t *td, int bl, int bd)
|
||||
|
||||
/* do the copy */
|
||||
do {
|
||||
n -= (e = (e = WSIZE - ((d &= WSIZE - 1) > w ? d : w)) > n ? n : e);
|
||||
n -= (e =
|
||||
(e =
|
||||
WSIZE - ((d &= WSIZE - 1) > w ? d : w)) > n ? n : e);
|
||||
#if !defined(NOMEMCPY) && !defined(DEBUG)
|
||||
if (w - d >= e) { /* (this test assumes unsigned comparison) */
|
||||
memcpy(window + w, window + d, e);
|
||||
@ -481,8 +488,7 @@ static int inflate_codes(huft_t *tl, huft_t *td, int bl, int bd)
|
||||
window[w++] = window[d++];
|
||||
} while (--e);
|
||||
if (w == WSIZE) {
|
||||
outcnt=(w),
|
||||
flush_window();
|
||||
outcnt = (w), flush_window();
|
||||
w = 0;
|
||||
}
|
||||
} while (n);
|
||||
@ -502,6 +508,7 @@ static const unsigned short cplens[] = { /* Copy lengths for literal codes 2
|
||||
3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
|
||||
35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0
|
||||
};
|
||||
|
||||
/* note: see note #13 above about the 258 in this list. */
|
||||
static const extra_bits_t cplext[] = { /* Extra bits for literal codes 257..285 */
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
|
||||
@ -517,6 +524,7 @@ static const extra_bits_t cpdext[] = { /* Extra bits for distance codes */
|
||||
7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
|
||||
12, 12, 13, 13
|
||||
};
|
||||
|
||||
/* Tables for deflate from PKZIP's appnote.txt. */
|
||||
static const extra_bits_t border[] = { /* Order of the bit length code lengths */
|
||||
16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
|
||||
@ -605,8 +613,7 @@ static int inflate_block(int *e)
|
||||
}
|
||||
window[w++] = (unsigned char) b_stored;
|
||||
if (w == (unsigned long) WSIZE) {
|
||||
outcnt=(w),
|
||||
flush_window();
|
||||
outcnt = (w), flush_window();
|
||||
w = 0;
|
||||
}
|
||||
b_stored >>= 8;
|
||||
@ -759,10 +766,10 @@ static int inflate_block(int *e)
|
||||
j = td->v.n;
|
||||
if (j < 16) { /* length of code in bits (0..15) */
|
||||
ll[i++] = l = j; /* save last length in l */
|
||||
}
|
||||
else if (j == 16) { /* repeat last length 3 to 6 times */
|
||||
} else if (j == 16) { /* repeat last length 3 to 6 times */
|
||||
while (k_dynamic < 2) {
|
||||
b_dynamic |= ((unsigned long)fgetc(in_file)) << k_dynamic;
|
||||
b_dynamic |=
|
||||
((unsigned long) fgetc(in_file)) << k_dynamic;
|
||||
k_dynamic += 8;
|
||||
}
|
||||
j = 3 + ((unsigned) b_dynamic & 3);
|
||||
@ -776,7 +783,8 @@ static int inflate_block(int *e)
|
||||
}
|
||||
} else if (j == 17) { /* 3 to 10 zero length codes */
|
||||
while (k_dynamic < 3) {
|
||||
b_dynamic |= ((unsigned long)fgetc(in_file)) << k_dynamic;
|
||||
b_dynamic |=
|
||||
((unsigned long) fgetc(in_file)) << k_dynamic;
|
||||
k_dynamic += 8;
|
||||
}
|
||||
j = 3 + ((unsigned) b_dynamic & 7);
|
||||
@ -791,7 +799,8 @@ static int inflate_block(int *e)
|
||||
l = 0;
|
||||
} else { /* j == 18: 11 to 138 zero length codes */
|
||||
while (k_dynamic < 7) {
|
||||
b_dynamic |= ((unsigned long)fgetc(in_file)) << k_dynamic;
|
||||
b_dynamic |=
|
||||
((unsigned long) fgetc(in_file)) << k_dynamic;
|
||||
k_dynamic += 8;
|
||||
}
|
||||
j = 11 + ((unsigned) b_dynamic & 0x7f);
|
||||
@ -921,11 +930,6 @@ extern int unzip(FILE *l_in_file, FILE *l_out_file)
|
||||
if (signal(SIGINT, SIG_IGN) != SIG_IGN) {
|
||||
(void) signal(SIGINT, (sig_type) abort_gzip);
|
||||
}
|
||||
#ifdef SIGTERM
|
||||
// if (signal(SIGTERM, SIG_IGN) != SIG_IGN) {
|
||||
// (void) signal(SIGTERM, (sig_type) abort_gzip);
|
||||
// }
|
||||
#endif
|
||||
#ifdef SIGHUP
|
||||
if (signal(SIGHUP, SIG_IGN) != SIG_IGN) {
|
||||
(void) signal(SIGHUP, (sig_type) abort_gzip);
|
||||
@ -963,7 +967,8 @@ extern int unzip(FILE *l_in_file, FILE *l_out_file)
|
||||
|
||||
if (flags & 0x04) {
|
||||
/* bit 2 set: extra field present */
|
||||
const unsigned short extra = fgetc(l_in_file) + (fgetc(l_in_file) << 8);
|
||||
const unsigned short extra =
|
||||
fgetc(l_in_file) + (fgetc(l_in_file) << 8);
|
||||
|
||||
for (i = 0; i < extra; i++) {
|
||||
fgetc(l_in_file);
|
||||
@ -994,11 +999,14 @@ extern int unzip(FILE *l_in_file, FILE *l_out_file)
|
||||
fread(buf, 1, 8, l_in_file);
|
||||
|
||||
/* Validate decompression - crc */
|
||||
if ((unsigned int)((buf[0] | (buf[1] << 8)) |((buf[2] | (buf[3] << 8)) << 16)) != (crc ^ 0xffffffffL)) {
|
||||
if ((unsigned int) ((buf[0] | (buf[1] << 8)) |
|
||||
((buf[2] | (buf[3] << 8)) << 16)) !=
|
||||
(crc ^ 0xffffffffL)) {
|
||||
error_msg("invalid compressed data--crc error");
|
||||
}
|
||||
/* Validate decompression - size */
|
||||
if (((buf[4] | (buf[5] << 8)) |((buf[6] | (buf[7] << 8)) << 16)) != (unsigned long) bytes_out) {
|
||||
if (((buf[4] | (buf[5] << 8)) | ((buf[6] | (buf[7] << 8)) << 16)) !=
|
||||
(unsigned long) bytes_out) {
|
||||
error_msg("invalid compressed data--length error");
|
||||
}
|
||||
|
||||
@ -1011,7 +1019,8 @@ extern int unzip(FILE *l_in_file, FILE *l_out_file)
|
||||
extern void gz_close(int gunzip_pid)
|
||||
{
|
||||
if (kill(gunzip_pid, SIGTERM) == -1) {
|
||||
error_msg_and_die("*** Couldnt kill old gunzip process *** aborting");
|
||||
error_msg_and_die
|
||||
("*** Couldnt kill old gunzip process *** aborting");
|
||||
}
|
||||
|
||||
if (waitpid(gunzip_pid, NULL, 0) == -1) {
|
||||
|
||||
130
libbb/dump.c
130
libbb/dump.c
@ -73,11 +73,19 @@ int size(FS *fs)
|
||||
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':
|
||||
@ -85,7 +93,9 @@ int size(FS *fs)
|
||||
break;
|
||||
case '_':
|
||||
switch (*++fmt) {
|
||||
case 'c': case 'p': case 'u':
|
||||
case 'c':
|
||||
case 'p':
|
||||
case 'u':
|
||||
bcnt += 1;
|
||||
break;
|
||||
}
|
||||
@ -143,8 +153,7 @@ void rewrite(FS *fs)
|
||||
sokay = USEPREC;
|
||||
prec = atoi(p1);
|
||||
while (isdigit(*++p1));
|
||||
}
|
||||
else
|
||||
} else
|
||||
sokay = NOTOKAY;
|
||||
}
|
||||
|
||||
@ -159,37 +168,49 @@ void rewrite(FS *fs)
|
||||
case 'c':
|
||||
pr->flags = F_CHAR;
|
||||
switch (fu->bcnt) {
|
||||
case 0: case 1:
|
||||
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':
|
||||
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:
|
||||
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:
|
||||
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) {
|
||||
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;
|
||||
@ -241,12 +270,15 @@ sw1: switch(fu->bcnt) {
|
||||
pr->flags = F_ADDRESS;
|
||||
++p2;
|
||||
switch (p1[2]) {
|
||||
case 'd': case 'o': case'x':
|
||||
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':
|
||||
@ -261,22 +293,27 @@ sw1: switch(fu->bcnt) {
|
||||
pr->flags = F_U;
|
||||
/* *p1 = 'c'; set in conv_u */
|
||||
sw2:switch (fu->bcnt) {
|
||||
case 0: case 1:
|
||||
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);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -293,7 +330,8 @@ sw2: switch(fu->bcnt) {
|
||||
|
||||
/* 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");
|
||||
error_msg_and_die
|
||||
("hexdump: byte count with multiple conversion characters.\n");
|
||||
}
|
||||
}
|
||||
/*
|
||||
@ -341,8 +379,7 @@ static void doskip(char *fname, int statok)
|
||||
}
|
||||
if ((!(S_ISCHR(sbuf.st_mode) ||
|
||||
S_ISBLK(sbuf.st_mode) ||
|
||||
S_ISFIFO(sbuf.st_mode)) ) &&
|
||||
skip >= sbuf.st_size) {
|
||||
S_ISFIFO(sbuf.st_mode))) && skip >= sbuf.st_size) {
|
||||
/* If size valid and skip >= size */
|
||||
skip -= sbuf.st_size;
|
||||
address += sbuf.st_size;
|
||||
@ -389,8 +426,7 @@ int next(char **argv)
|
||||
/* NOTREACHED */
|
||||
}
|
||||
|
||||
static u_char *
|
||||
get(void)
|
||||
static u_char *get(void)
|
||||
{
|
||||
static int ateof = 1;
|
||||
static u_char *curp, *savp;
|
||||
@ -441,8 +477,7 @@ 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;
|
||||
}
|
||||
@ -547,13 +582,14 @@ void conv_u(PR *pr, u_char *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) {
|
||||
@ -574,7 +610,7 @@ void display(void)
|
||||
savech = *pr->nospace;
|
||||
*pr->nospace = '\0';
|
||||
}
|
||||
// PRINT;
|
||||
/* PRINT; */
|
||||
switch (pr->flags) {
|
||||
case F_ADDRESS:
|
||||
printf(pr->fmt, address);
|
||||
@ -591,13 +627,16 @@ void display(void)
|
||||
case F_DBL:{
|
||||
double dval;
|
||||
float fval;
|
||||
|
||||
switch (pr->bcnt) {
|
||||
case 4:
|
||||
bcopy((char *)bp, (char *)&fval, sizeof(fval));
|
||||
bcopy((char *) bp, (char *) &fval,
|
||||
sizeof(fval));
|
||||
printf(pr->fmt, fval);
|
||||
break;
|
||||
case 8:
|
||||
bcopy((char *)bp, (char *)&dval, sizeof(dval));
|
||||
bcopy((char *) bp, (char *) &dval,
|
||||
sizeof(dval));
|
||||
printf(pr->fmt, dval);
|
||||
break;
|
||||
}
|
||||
@ -606,16 +645,19 @@ void display(void)
|
||||
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));
|
||||
bcopy((char *) bp, (char *) &sval,
|
||||
sizeof(sval));
|
||||
printf(pr->fmt, (int) sval);
|
||||
break;
|
||||
case 4:
|
||||
bcopy((char *)bp, (char *)&ival, sizeof(ival));
|
||||
bcopy((char *) bp, (char *) &ival,
|
||||
sizeof(ival));
|
||||
printf(pr->fmt, ival);
|
||||
break;
|
||||
}
|
||||
@ -636,16 +678,19 @@ void display(void)
|
||||
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));
|
||||
bcopy((char *) bp, (char *) &sval,
|
||||
sizeof(sval));
|
||||
printf(pr->fmt, (u_int) sval);
|
||||
break;
|
||||
case 4:
|
||||
bcopy((char *)bp, (char *)&ival, sizeof(ival));
|
||||
bcopy((char *) bp, (char *) &ival,
|
||||
sizeof(ival));
|
||||
printf(pr->fmt, ival);
|
||||
break;
|
||||
}
|
||||
@ -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;
|
||||
|
||||
@ -829,6 +874,7 @@ void add(char *fmt)
|
||||
p++;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Copyright (c) 1989 The Regents of the University of California.
|
||||
* All rights reserved.
|
||||
|
||||
@ -115,7 +115,7 @@ static const unsigned short mask_bits[] = {
|
||||
0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff
|
||||
};
|
||||
|
||||
//static int error_number = 0;
|
||||
/* static int error_number = 0; */
|
||||
/* ========================================================================
|
||||
* Signal and error handler.
|
||||
*/
|
||||
@ -145,7 +145,9 @@ static void make_crc_table(void)
|
||||
* zero was stolen from Haruhiko Okumura's ar002
|
||||
*/
|
||||
for (k = 8; k; k--) {
|
||||
table_entry = table_entry & 1 ? (table_entry >> 1) ^ poly : table_entry >> 1;
|
||||
table_entry =
|
||||
table_entry & 1 ? (table_entry >> 1) ^ poly : table_entry >>
|
||||
1;
|
||||
}
|
||||
crc_table[i] = table_entry;
|
||||
}
|
||||
@ -209,8 +211,9 @@ typedef unsigned char extra_bits_t;
|
||||
* t: result: starting table
|
||||
* m: maximum lookup bits, returns actual
|
||||
*/
|
||||
static int huft_build(unsigned int *b, const unsigned int n, const unsigned int s,
|
||||
const unsigned short *d, const extra_bits_t *e, huft_t **t, int *m)
|
||||
static int huft_build(unsigned int *b, const unsigned int n,
|
||||
const unsigned int s, const unsigned short *d,
|
||||
const extra_bits_t * e, huft_t ** t, int *m)
|
||||
{
|
||||
unsigned a; /* counter for codes of length k */
|
||||
unsigned c[BMAX + 1]; /* bit length count table */
|
||||
@ -413,14 +416,14 @@ static int inflate_codes(huft_t *tl, huft_t *td, int bl, int bd)
|
||||
b |= ((unsigned long) fgetc(in_file)) << k;
|
||||
k += 8;
|
||||
}
|
||||
} while ((e = (t = t->v.t + ((unsigned) b & mask_bits[e]))->e) > 16);
|
||||
} while ((e =
|
||||
(t = t->v.t + ((unsigned) b & mask_bits[e]))->e) > 16);
|
||||
b >>= t->b;
|
||||
k -= t->b;
|
||||
if (e == 16) { /* then it's a literal */
|
||||
window[w++] = (unsigned char) t->v.n;
|
||||
if (w == WSIZE) {
|
||||
outcnt=(w),
|
||||
flush_window();
|
||||
outcnt = (w), flush_window();
|
||||
w = 0;
|
||||
}
|
||||
} else { /* it's an EOB or a length */
|
||||
@ -456,7 +459,9 @@ static int inflate_codes(huft_t *tl, huft_t *td, int bl, int bd)
|
||||
b |= ((unsigned long) fgetc(in_file)) << k;
|
||||
k += 8;
|
||||
}
|
||||
} while ((e = (t = t->v.t + ((unsigned) b & mask_bits[e]))->e) > 16);
|
||||
} while ((e =
|
||||
(t =
|
||||
t->v.t + ((unsigned) b & mask_bits[e]))->e) > 16);
|
||||
b >>= t->b;
|
||||
k -= t->b;
|
||||
while (k < e) {
|
||||
@ -469,7 +474,9 @@ static int inflate_codes(huft_t *tl, huft_t *td, int bl, int bd)
|
||||
|
||||
/* do the copy */
|
||||
do {
|
||||
n -= (e = (e = WSIZE - ((d &= WSIZE - 1) > w ? d : w)) > n ? n : e);
|
||||
n -= (e =
|
||||
(e =
|
||||
WSIZE - ((d &= WSIZE - 1) > w ? d : w)) > n ? n : e);
|
||||
#if !defined(NOMEMCPY) && !defined(DEBUG)
|
||||
if (w - d >= e) { /* (this test assumes unsigned comparison) */
|
||||
memcpy(window + w, window + d, e);
|
||||
@ -481,8 +488,7 @@ static int inflate_codes(huft_t *tl, huft_t *td, int bl, int bd)
|
||||
window[w++] = window[d++];
|
||||
} while (--e);
|
||||
if (w == WSIZE) {
|
||||
outcnt=(w),
|
||||
flush_window();
|
||||
outcnt = (w), flush_window();
|
||||
w = 0;
|
||||
}
|
||||
} while (n);
|
||||
@ -502,6 +508,7 @@ static const unsigned short cplens[] = { /* Copy lengths for literal codes 2
|
||||
3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
|
||||
35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0
|
||||
};
|
||||
|
||||
/* note: see note #13 above about the 258 in this list. */
|
||||
static const extra_bits_t cplext[] = { /* Extra bits for literal codes 257..285 */
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
|
||||
@ -517,6 +524,7 @@ static const extra_bits_t cpdext[] = { /* Extra bits for distance codes */
|
||||
7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
|
||||
12, 12, 13, 13
|
||||
};
|
||||
|
||||
/* Tables for deflate from PKZIP's appnote.txt. */
|
||||
static const extra_bits_t border[] = { /* Order of the bit length code lengths */
|
||||
16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
|
||||
@ -605,8 +613,7 @@ static int inflate_block(int *e)
|
||||
}
|
||||
window[w++] = (unsigned char) b_stored;
|
||||
if (w == (unsigned long) WSIZE) {
|
||||
outcnt=(w),
|
||||
flush_window();
|
||||
outcnt = (w), flush_window();
|
||||
w = 0;
|
||||
}
|
||||
b_stored >>= 8;
|
||||
@ -759,10 +766,10 @@ static int inflate_block(int *e)
|
||||
j = td->v.n;
|
||||
if (j < 16) { /* length of code in bits (0..15) */
|
||||
ll[i++] = l = j; /* save last length in l */
|
||||
}
|
||||
else if (j == 16) { /* repeat last length 3 to 6 times */
|
||||
} else if (j == 16) { /* repeat last length 3 to 6 times */
|
||||
while (k_dynamic < 2) {
|
||||
b_dynamic |= ((unsigned long)fgetc(in_file)) << k_dynamic;
|
||||
b_dynamic |=
|
||||
((unsigned long) fgetc(in_file)) << k_dynamic;
|
||||
k_dynamic += 8;
|
||||
}
|
||||
j = 3 + ((unsigned) b_dynamic & 3);
|
||||
@ -776,7 +783,8 @@ static int inflate_block(int *e)
|
||||
}
|
||||
} else if (j == 17) { /* 3 to 10 zero length codes */
|
||||
while (k_dynamic < 3) {
|
||||
b_dynamic |= ((unsigned long)fgetc(in_file)) << k_dynamic;
|
||||
b_dynamic |=
|
||||
((unsigned long) fgetc(in_file)) << k_dynamic;
|
||||
k_dynamic += 8;
|
||||
}
|
||||
j = 3 + ((unsigned) b_dynamic & 7);
|
||||
@ -791,7 +799,8 @@ static int inflate_block(int *e)
|
||||
l = 0;
|
||||
} else { /* j == 18: 11 to 138 zero length codes */
|
||||
while (k_dynamic < 7) {
|
||||
b_dynamic |= ((unsigned long)fgetc(in_file)) << k_dynamic;
|
||||
b_dynamic |=
|
||||
((unsigned long) fgetc(in_file)) << k_dynamic;
|
||||
k_dynamic += 8;
|
||||
}
|
||||
j = 11 + ((unsigned) b_dynamic & 0x7f);
|
||||
@ -921,11 +930,6 @@ extern int unzip(FILE *l_in_file, FILE *l_out_file)
|
||||
if (signal(SIGINT, SIG_IGN) != SIG_IGN) {
|
||||
(void) signal(SIGINT, (sig_type) abort_gzip);
|
||||
}
|
||||
#ifdef SIGTERM
|
||||
// if (signal(SIGTERM, SIG_IGN) != SIG_IGN) {
|
||||
// (void) signal(SIGTERM, (sig_type) abort_gzip);
|
||||
// }
|
||||
#endif
|
||||
#ifdef SIGHUP
|
||||
if (signal(SIGHUP, SIG_IGN) != SIG_IGN) {
|
||||
(void) signal(SIGHUP, (sig_type) abort_gzip);
|
||||
@ -963,7 +967,8 @@ extern int unzip(FILE *l_in_file, FILE *l_out_file)
|
||||
|
||||
if (flags & 0x04) {
|
||||
/* bit 2 set: extra field present */
|
||||
const unsigned short extra = fgetc(l_in_file) + (fgetc(l_in_file) << 8);
|
||||
const unsigned short extra =
|
||||
fgetc(l_in_file) + (fgetc(l_in_file) << 8);
|
||||
|
||||
for (i = 0; i < extra; i++) {
|
||||
fgetc(l_in_file);
|
||||
@ -994,11 +999,14 @@ extern int unzip(FILE *l_in_file, FILE *l_out_file)
|
||||
fread(buf, 1, 8, l_in_file);
|
||||
|
||||
/* Validate decompression - crc */
|
||||
if ((unsigned int)((buf[0] | (buf[1] << 8)) |((buf[2] | (buf[3] << 8)) << 16)) != (crc ^ 0xffffffffL)) {
|
||||
if ((unsigned int) ((buf[0] | (buf[1] << 8)) |
|
||||
((buf[2] | (buf[3] << 8)) << 16)) !=
|
||||
(crc ^ 0xffffffffL)) {
|
||||
error_msg("invalid compressed data--crc error");
|
||||
}
|
||||
/* Validate decompression - size */
|
||||
if (((buf[4] | (buf[5] << 8)) |((buf[6] | (buf[7] << 8)) << 16)) != (unsigned long) bytes_out) {
|
||||
if (((buf[4] | (buf[5] << 8)) | ((buf[6] | (buf[7] << 8)) << 16)) !=
|
||||
(unsigned long) bytes_out) {
|
||||
error_msg("invalid compressed data--length error");
|
||||
}
|
||||
|
||||
@ -1011,7 +1019,8 @@ extern int unzip(FILE *l_in_file, FILE *l_out_file)
|
||||
extern void gz_close(int gunzip_pid)
|
||||
{
|
||||
if (kill(gunzip_pid, SIGTERM) == -1) {
|
||||
error_msg_and_die("*** Couldnt kill old gunzip process *** aborting");
|
||||
error_msg_and_die
|
||||
("*** Couldnt kill old gunzip process *** aborting");
|
||||
}
|
||||
|
||||
if (waitpid(gunzip_pid, NULL, 0) == -1) {
|
||||
|
||||
1297
shell/ash.c
1297
shell/ash.c
File diff suppressed because it is too large
Load Diff
@ -54,7 +54,7 @@ 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);
|
||||
}
|
||||
@ -87,8 +87,9 @@ 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);
|
||||
}
|
||||
@ -104,7 +105,8 @@ static void doKlogd (void)
|
||||
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') {
|
||||
|
||||
@ -125,12 +125,12 @@ 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) {
|
||||
int loro = flags & MS_RDONLY;
|
||||
@ -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)
|
||||
@ -166,7 +168,7 @@ do_mount(char *specialfile, char *dir, char *filesystemtype,
|
||||
|
||||
#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
|
||||
@ -195,8 +197,7 @@ static void paste_str(char **s1, const char *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;
|
||||
@ -245,7 +246,9 @@ 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];
|
||||
@ -255,7 +258,8 @@ mount_one(char *blockDevice, char *directory, char *filesystemType,
|
||||
|
||||
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;
|
||||
}
|
||||
@ -286,7 +290,7 @@ mount_one(char *blockDevice, char *directory, char *filesystemType,
|
||||
else {
|
||||
filesystemType = buf;
|
||||
|
||||
// Add NULL termination to each line
|
||||
/* Add NULL termination to each line */
|
||||
while (*filesystemType && !isspace(*filesystemType))
|
||||
filesystemType++;
|
||||
*filesystemType = '\0';
|
||||
@ -294,7 +298,8 @@ mount_one(char *blockDevice, char *directory, char *filesystemType,
|
||||
filesystemType = buf;
|
||||
|
||||
if (xstrlen(filesystemType)) {
|
||||
status = do_mount(blockDevice, directory, filesystemType,
|
||||
status =
|
||||
do_mount(blockDevice, directory, filesystemType,
|
||||
flags | MS_MGC_VAL, string_flags,
|
||||
useMtab, fakeIt, mtab_opts, mount_all);
|
||||
if (status)
|
||||
@ -311,15 +316,15 @@ mount_one(char *blockDevice, char *directory, char *filesystemType,
|
||||
|
||||
while (fgets(buf, sizeof(buf), f) != NULL) {
|
||||
filesystemType = buf;
|
||||
if (*filesystemType == '\t') { // Not a nodev filesystem
|
||||
if (*filesystemType == '\t') { /* Not a nodev filesystem */
|
||||
|
||||
// Add NULL termination to each line
|
||||
/* 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,
|
||||
@ -364,7 +369,8 @@ static void show_mounts(char *onlytype)
|
||||
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));
|
||||
mntentlist =
|
||||
(struct k_mntent *) xcalloc(numfilesystems, sizeof(struct k_mntent));
|
||||
|
||||
/* Grab the list of mounted filesystems */
|
||||
if (ioctl(fd, DEVMTAB_GET_MOUNTS, mntentlist) < 0)
|
||||
@ -393,6 +399,7 @@ 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);
|
||||
}
|
||||
@ -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);
|
||||
@ -486,20 +494,21 @@ extern int mount_main(int argc, char **argv)
|
||||
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
|
||||
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);
|
||||
@ -522,7 +531,8 @@ singlemount:
|
||||
}
|
||||
#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)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user