From dfe0e5833a279b70e077a1b0b36e9903f1dc6d13 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 27 Feb 2008 21:52:16 +0000 Subject: 2008-02-27 Joel Sherrill * 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. --- cpukit/libmisc/shell/main_date.c | 46 ++++++++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 6 deletions(-) (limited to 'cpukit/libmisc/shell/main_date.c') diff --git a/cpukit/libmisc/shell/main_date.c b/cpukit/libmisc/shell/main_date.c index b3180eecd8..4d3f4fa94f 100644 --- a/cpukit/libmisc/shell/main_date.c +++ b/cpukit/libmisc/shell/main_date.c @@ -25,18 +25,52 @@ #include #include "internal.h" -int rtems_shell_main_date(int argc,char *argv[]) +int rtems_shell_main_date( + int argc, + char *argv[] +) { - time_t t; + /* + * Print the current date and time in default format. + */ + if ( argc == 1 ) { + time_t t; - time(&t); - fprintf(stdout,"%s", ctime(&t)); - return 0; + time(&t); + printf("%s", ctime(&t)); + return 0; + } + + /* + * Set the current date and time + */ + if ( argc == 3 ) { + char buf[128]; + struct tm TOD; + struct timespec timesp; + char *result; + + sprintf( buf, "%s %s", argv[1], argv[2] ); + result = strptime( + buf, + "%Y-%m-%d %T", + &TOD + ); + if ( result && !*result ) { + timesp.tv_sec = mktime( &TOD ); + timesp.tv_nsec = 0; + clock_settime( CLOCK_REALTIME, ×p ); + return 0; + } + } + + fprintf( stderr, "%s: Usage: [YYYY-MM-DD HH:MM:SS]\n", argv[0] ); + return -1; } rtems_shell_cmd_t rtems_shell_DATE_Command = { "date", /* name */ - "date", /* usage */ + "date [YYYY-MM-DD HH:MM:SS]", /* usage */ "misc", /* topic */ rtems_shell_main_date, /* command */ NULL, /* alias */ -- cgit v1.2.3