Remove do_listing variable
This commit is contained in:
parent
ba3de80478
commit
35b4e24e98
1 changed files with 3 additions and 8 deletions
|
@ -132,7 +132,6 @@ EXPORT FILE *infile = NULL;
|
||||||
EXPORT BOOL ignerr = FALSE;
|
EXPORT BOOL ignerr = FALSE;
|
||||||
LOCAL int use_rock = 0;
|
LOCAL int use_rock = 0;
|
||||||
LOCAL int use_joliet = 0;
|
LOCAL int use_joliet = 0;
|
||||||
LOCAL int do_listing = 0;
|
|
||||||
LOCAL int do_f = 0;
|
LOCAL int do_f = 0;
|
||||||
LOCAL int do_find = 0;
|
LOCAL int do_find = 0;
|
||||||
LOCAL int find_ac = 0; /* ac past -find option */
|
LOCAL int find_ac = 0; /* ac past -find option */
|
||||||
|
@ -526,9 +525,9 @@ dump_stat(rootname, idr, fname, extent)
|
||||||
if (do_find) {
|
if (do_find) {
|
||||||
if (!find_stat(rootname, idr, fname, extent))
|
if (!find_stat(rootname, idr, fname, extent))
|
||||||
return (FALSE);
|
return (FALSE);
|
||||||
if (!do_listing || find_print)
|
if (find_print)
|
||||||
return (TRUE);
|
return (TRUE);
|
||||||
} else if (!do_listing)
|
} else
|
||||||
return (TRUE);
|
return (TRUE);
|
||||||
|
|
||||||
memset(outline, ' ', sizeof (outline));
|
memset(outline, ' ', sizeof (outline));
|
||||||
|
@ -949,10 +948,6 @@ parse_dir(dp, rootname, extent, len)
|
||||||
static char *n = 0;
|
static char *n = 0;
|
||||||
static int nlen = 0;
|
static int nlen = 0;
|
||||||
|
|
||||||
|
|
||||||
if (do_listing && (!do_find || !find_print))
|
|
||||||
printf(_("\nDirectory listing of %s\n"), rootname);
|
|
||||||
|
|
||||||
rlen = strlen(rootname);
|
rlen = strlen(rootname);
|
||||||
|
|
||||||
while (len > 0) {
|
while (len > 0) {
|
||||||
|
@ -1055,7 +1050,7 @@ static int nlen = 0;
|
||||||
(idr->name[0] != 0 && idr->name[0] != 1))) {
|
(idr->name[0] != 0 && idr->name[0] != 1))) {
|
||||||
printf("%s\n", n);
|
printf("%s\n", n);
|
||||||
}
|
}
|
||||||
if (do_listing || Xtract || do_find) {
|
if (Xtract || do_find) {
|
||||||
/*
|
/*
|
||||||
* In case if a multi-extent file, remember the
|
* In case if a multi-extent file, remember the
|
||||||
* start extent number.
|
* start extent number.
|
||||||
|
|
Loading…
Reference in a new issue