Upgrade mtools to 3.0.37
This version contains a fix for -Wstring-concatenation error.
Test: presubmit
Bug: 175068488
Change-Id: Id4f2ae49da91a481ab2625fdf17668689b640794
diff --git a/mdir.c b/mdir.c
index 788ef5a..b1d4685 100644
--- a/mdir.c
+++ b/mdir.c
@@ -48,14 +48,14 @@
static int filesInDir; /* files in current dir */
static int filesOnDrive; /* files on drive */
-
+
static int dirsOnDrive; /* number of listed directories on this drive */
static int debug = 0; /* debug mode */
-static mt_size_t bytesInDir;
-static mt_size_t bytesOnDrive;
-static Stream_t *RootDir;
+static mt_off_t bytesInDir;
+static mt_off_t bytesOnDrive;
+static Stream_t *RootDir;
static char mdir_shortname[4*12+1];
@@ -105,7 +105,7 @@
{
char am_pm;
int hour = DOS_HOUR(dir);
-
+
if(!mtools_twenty_four_hour_clock) {
am_pm = (hour >= 12) ? 'p' : 'a';
if (hour > 12)
@@ -121,11 +121,11 @@
/*
* Return a number in dotted notation
*/
-static const char *dotted_num(mt_size_t num, int width, char **buf)
+static const char *dotted_num(mt_off_t num, size_t width, char **buf)
{
size_t len;
register char *srcp, *dstp;
- int size;
+ size_t size;
unsigned long numlo;
unsigned long numhi;
@@ -135,18 +135,18 @@
if (*buf == NULL)
return "";
-
+
/* Create the number in maximum width; make sure that the string
* length is not exceeded (in %6ld, the result can be longer than 6!)
*/
numlo = num % 1000000000;
- numhi = num / 1000000000;
+ numhi = (unsigned long) (num / 1000000000);
if(numhi && size > 9) {
- sprintf(*buf, "%.*lu%09lu", size-9, numhi, numlo);
+ sprintf(*buf, "%.*lu%09lu", (int)(size-9), numhi, numlo);
} else {
- sprintf(*buf, "%.*lu", size, numlo);
+ sprintf(*buf, "%.*lu", (int) size, numlo);
}
for (srcp=*buf; srcp[1] != '\0'; ++srcp)
@@ -154,7 +154,7 @@
srcp[0] = ' ';
else
break;
-
+
len = strlen(*buf);
srcp = (*buf)+len;
dstp = (*buf)+len+1;
@@ -172,7 +172,7 @@
if (dstp + 3 < (*buf) + len)
/* use spaces instead of dots: they please both
* Americans and Europeans */
- dstp[3] = ' ';
+ dstp[3] = ' ';
srcp += 3;
dstp += 4;
}
@@ -184,7 +184,7 @@
{
Stream_t *Stream = GetFs(Dir);
direntry_t entry;
- DeclareThis(FsPublic_t);
+ DeclareThis(Fs_t);
char shortname[13];
char longname[VBUFSIZE];
int r;
@@ -192,7 +192,7 @@
RootDir = OpenRoot(Stream);
if(concise)
return 0;
-
+
/* find the volume label */
initializeDirentry(&entry, RootDir);
@@ -210,19 +210,21 @@
else
printf(" Volume in drive %c is %s",
drive, shortname);
- if(This->serialized)
+ if(getSerialized(This)) {
+ unsigned long serial_number = getSerialNumber(This);
printf("\n Volume Serial Number is %04lX-%04lX",
- (This->serial_number >> 16) & 0xffff,
- This->serial_number & 0xffff);
+ (serial_number >> 16) & 0xffff,
+ serial_number & 0xffff);
+ }
return 0;
}
-static void printSummary(int files, mt_size_t bytes)
+static void printSummary(int files, mt_off_t bytes)
{
if(!filesInDir)
printf("No files\n");
- else {
+ else {
char *s1 = NULL;
printf(" %3d file", files);
if(files == 1)
@@ -279,10 +281,10 @@
int r;
if(currentDrive == drive)
return 0; /* still the same */
-
+
leaveDrive(0);
currentDrive = drive;
-
+
r = print_volume_label(Dir, drive);
if (r)
return r;
@@ -306,7 +308,7 @@
free(dynDirPath);
if(wide)
putchar('\n');
-
+
if(!concise)
printSummary(filesInDir, bytesInDir);
}
@@ -372,21 +374,21 @@
return ERROR_ONE;
if (wide) {
if(filesInDir % 5)
- putchar(' ');
+ putchar(' ');
else
putchar('\n');
}
-
+
if(IS_DIR(entry)){
size = 0;
} else
size = FILE_SIZE(&entry->dir);
-
+
Case = entry->dir.Case;
- if(!(Case & (BASECASE | EXTCASE)) &&
+ if(!(Case & (BASECASE | EXTCASE)) &&
mtools_ignore_short_case)
Case |= BASECASE | EXTCASE;
-
+
cp = GET_DOSCONVERT(entry->Dir);
dos_to_wchar(cp, entry->dir.ext, ext, 3);
if(Case & EXTCASE){
@@ -411,13 +413,13 @@
(int) (15 - 2 - strlen(mdir_shortname)), "");
else
printf("%-15s", mdir_shortname);
- } else if(!concise) {
+ } else if(!concise) {
char tmpBasename[4*8+1];
char tmpExt[4*3+1];
WCHAR_TO_NATIVE(name,tmpBasename,8);
WCHAR_TO_NATIVE(ext,tmpExt,3);
- if (name[0] == ' ')
+ if (name[0] == ' ')
printf(" ");
else if(mtools_dotted_dir)
printf("%-12s ", mdir_shortname);
@@ -435,7 +437,7 @@
if(debug)
printf(" %s %d ", tmpBasename, START(&entry->dir));
-
+
if(*mdir_longname)
printf(" %s", mdir_longname);
printf("\n");
@@ -453,8 +455,8 @@
filesOnDrive++;
filesInDir++;
- bytesOnDrive += (mt_size_t) size;
- bytesInDir += (mt_size_t) size;
+ bytesOnDrive += size;
+ bytesInDir += size;
return GOT_ONE;
}
@@ -499,7 +501,7 @@
/* then list subdirectories */
subMp = *mp;
subMp.lookupflags = ACCEPT_DIR | NO_DOTS | NO_MSG | DO_OPEN;
- return ret | mp->loop(mp->File, &subMp, "*");
+ return ret | mp->loop(mp->File, &subMp, "*") | GOT_ONE;
}
#if 0
@@ -600,11 +602,12 @@
if (testmode) {
mp.lookupflags = ACCEPT_DIR | NO_DOTS;
mp.dirCallback = test_directory;
- } else
+ } else
#endif
- if(recursive) {
- mp.lookupflags = ACCEPT_DIR | DO_OPEN_DIRS | NO_DOTS;
+ if(recursive) {
+ mp.lookupflags = ACCEPT_DIR | ACCEPT_PLAIN | DO_OPEN_DIRS | NO_DOTS;
mp.dirCallback = list_recurs_directory;
+ mp.callback = list_file;
} else {
mp.lookupflags = ACCEPT_DIR | ACCEPT_PLAIN | DO_OPEN_DIRS;
mp.dirCallback = list_non_recurs_directory;