apps/examples/stat: Fix a backward conditional test. Improve output.

This commit is contained in:
Gregory Nutt 2017-02-13 16:46:23 -06:00
parent 78f92746c4
commit 76269d7bad

View File

@ -61,7 +61,7 @@ static struct mallinfo g_mmafter;
static void showusage(FAR struct mallinfo *mmbefore, static void showusage(FAR struct mallinfo *mmbefore,
FAR struct mallinfo *mmafter, FAR const char *msg) FAR struct mallinfo *mmafter, FAR const char *msg)
{ {
if (mmbefore->uordblks > mmafter->uordblks) if (mmbefore->uordblks != mmafter->uordblks)
{ {
printf("\n%s:\n", msg); printf("\n%s:\n", msg);
printf("VARIABLE BEFORE AFTER\n"); printf("VARIABLE BEFORE AFTER\n");
@ -172,7 +172,7 @@ static void dump_stat(FAR struct stat *buf)
details[8]='w'; details[8]='w';
} }
printf("\nstat:\n"); printf("stat buffer:\n");
printf(" st_mode: %04x %s\n", buf->st_mode, details); printf(" st_mode: %04x %s\n", buf->st_mode, details);
printf(" st_size: %llu\n", (unsigned long long)buf->st_size); printf(" st_size: %llu\n", (unsigned long long)buf->st_size);
printf(" st_blksize: %lu\n", (unsigned long)buf->st_blksize); printf(" st_blksize: %lu\n", (unsigned long)buf->st_blksize);
@ -184,7 +184,7 @@ static void dump_stat(FAR struct stat *buf)
static void dump_statfs(FAR struct statfs *buf) static void dump_statfs(FAR struct statfs *buf)
{ {
printf("\nstatfs:\n"); printf("statfs buffer:\n");
printf(" f_type: %lu\n", (unsigned long)buf->f_type); printf(" f_type: %lu\n", (unsigned long)buf->f_type);
printf(" f_namelen: %lu\n", (unsigned long)buf->f_namelen); printf(" f_namelen: %lu\n", (unsigned long)buf->f_namelen);
printf(" f_bsize: %lu\n", (unsigned long)buf->f_bsize); printf(" f_bsize: %lu\n", (unsigned long)buf->f_bsize);
@ -240,6 +240,7 @@ int stat_main(int argc, char *argv[])
/* Try stat first */ /* Try stat first */
printf("\nTest stat(%s)\n", path);
ret = stat(path, &statbuf); ret = stat(path, &statbuf);
if (ret < 0) if (ret < 0)
{ {
@ -256,6 +257,7 @@ int stat_main(int argc, char *argv[])
/* Try statfs */ /* Try statfs */
printf("\nTest statfs(%s)\n", path);
ret = statfs(path, &statfsbuf); ret = statfs(path, &statfsbuf);
if (ret < 0) if (ret < 0)
{ {
@ -272,7 +274,10 @@ int stat_main(int argc, char *argv[])
if (isreg) if (isreg)
{ {
int fd = open(path, O_RDONLY); int fd;
printf("\nOpen(%s) and test fstat()\n", path);
fd = open(path, O_RDONLY);
if (fd < 0) if (fd < 0)
{ {
int errcode = errno; int errcode = errno;
@ -282,8 +287,6 @@ int stat_main(int argc, char *argv[])
return EXIT_FAILURE; return EXIT_FAILURE;
} }
stepusage();
ret = fstat(fd, &statbuf); ret = fstat(fd, &statbuf);
if (ret < 0) if (ret < 0)
{ {
@ -297,8 +300,8 @@ int stat_main(int argc, char *argv[])
dump_stat(&statbuf); dump_stat(&statbuf);
} }
stepusage();
close(fd); close(fd);
stepusage();
} }
endusage(); endusage();