diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-02-27 21:52:16 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-02-27 21:52:16 +0000 |
commit | dfe0e5833a279b70e077a1b0b36e9903f1dc6d13 (patch) | |
tree | dbb2538052be1d504e42ab4e99438f09bd6f7765 /cpukit/libmisc/shell/main_ls.c | |
parent | 2008-02-27 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
download | rtems-dfe0e5833a279b70e077a1b0b36e9903f1dc6d13.tar.bz2 |
2008-02-27 Joel Sherrill <joel.sherrill@oarcorp.com>
* libmisc/shell/cat_file.c, libmisc/shell/main_alias.c,
libmisc/shell/main_blksync.c, libmisc/shell/main_cat.c,
libmisc/shell/main_chdir.c, libmisc/shell/main_chmod.c,
libmisc/shell/main_chroot.c, libmisc/shell/main_cpuuse.c,
libmisc/shell/main_date.c, libmisc/shell/main_help.c,
libmisc/shell/main_id.c, libmisc/shell/main_logoff.c,
libmisc/shell/main_ls.c, libmisc/shell/main_mallocinfo.c,
libmisc/shell/main_mdump.c, libmisc/shell/main_medit.c,
libmisc/shell/main_mfill.c, libmisc/shell/main_mkdir.c,
libmisc/shell/main_mmove.c, libmisc/shell/main_mount.c,
libmisc/shell/main_mount_nfs.c, libmisc/shell/main_msdosfmt.c,
libmisc/shell/main_mwdump.c, libmisc/shell/main_perioduse.c,
libmisc/shell/main_pwd.c, libmisc/shell/main_rm.c,
libmisc/shell/main_rmdir.c, libmisc/shell/main_stackuse.c,
libmisc/shell/main_tty.c, libmisc/shell/main_umask.c,
libmisc/shell/main_unmount.c, libmisc/shell/main_whoami.c,
libmisc/shell/shell.h: Clean up done while writing documentation.
Some command improvements such as date now allows setting of the
current TOD. Often commands did not use stdout/stderr per
expectations and did not return -1 on an error.
Diffstat (limited to 'cpukit/libmisc/shell/main_ls.c')
-rw-r--r-- | cpukit/libmisc/shell/main_ls.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/cpukit/libmisc/shell/main_ls.c b/cpukit/libmisc/shell/main_ls.c index 51dfd160e7..c81e35efda 100644 --- a/cpukit/libmisc/shell/main_ls.c +++ b/cpukit/libmisc/shell/main_ls.c @@ -35,7 +35,10 @@ #include <rtems/shell.h> #include "internal.h" -int rtems_shell_main_ls(int argc, char *argv[]) +int rtems_shell_main_ls( + int argc, + char *argv[] +) { char *fname; DIR *dirp; @@ -55,7 +58,7 @@ int rtems_shell_main_ls(int argc, char *argv[]) fname = argv[1]; if ((dirp = opendir(fname)) == NULL) { - fprintf(stdout,"%s: No such file or directory.\n", fname); + fprintf(stderr,"%s: %s: No such file or directory.\n", argv[0], fname); return errno; } n = 0; @@ -65,13 +68,13 @@ int rtems_shell_main_ls(int argc, char *argv[]) if (nbuf[strlen(nbuf)-1]!='/') strcat(nbuf,"/"); strcat(nbuf,dp->d_name); /* always the fullpathname. Avoid ftpd problem.*/ - if (stat(nbuf, &stat_buf) == 0) { /* AWFUL buts works...*/ - strftime(sbuf,sizeof(sbuf)-1,"%b %d %H:%M",gmtime(&stat_buf.st_mtime)); + if (stat(nbuf, &stat_buf) == 0) { /* AWFUL but works...*/ + strftime(sbuf,sizeof(sbuf)-1,"%b %d %H:%M", gmtime(&stat_buf.st_mtime)); pwd = getpwuid(stat_buf.st_uid); user = pwd?pwd->pw_name:"nouser"; grp = getgrgid(stat_buf.st_gid); group = grp?grp->gr_name:"nogrp"; - fprintf(stdout,"%c%c%c%c%c%c%c%c%c%c %3d %6.6s %6.6s %11d %s %s%c\n", + printf("%c%c%c%c%c%c%c%c%c%c %3d %6.6s %6.6s %11d %s %s%c\n", (S_ISLNK(stat_buf.st_mode)?('l'): (S_ISDIR(stat_buf.st_mode)?('d'):('-'))), (stat_buf.st_mode & S_IRUSR)?('r'):('-'), @@ -93,7 +96,7 @@ int rtems_shell_main_ls(int argc, char *argv[]) size += stat_buf.st_size; } } - fprintf(stdout,"%d files %d bytes occupied\n",n,size); + printf("%d files %d bytes occupied\n",n,size); closedir(dirp); return 0; } |