diff options
Diffstat (limited to 'date.c')
-rw-r--r-- | date.c | 16 |
1 files changed, 5 insertions, 11 deletions
@@ -34,7 +34,7 @@ | |||
34 | an RFC 822 complient date output for shell scripting | 34 | an RFC 822 complient date output for shell scripting |
35 | mail commands */ | 35 | mail commands */ |
36 | 36 | ||
37 | const char date_usage[] = "Usage: date [OPTION]... [+FORMAT]\n" | 37 | const char date_usage[] = "date [OPTION]... [+FORMAT]\n" |
38 | " or: date [OPTION] [MMDDhhmm[[CC]YY][.ss]]\n" | 38 | " or: date [OPTION] [MMDDhhmm[[CC]YY][.ss]]\n" |
39 | "Display the current time in the given FORMAT, or set the system date.\n" | 39 | "Display the current time in the given FORMAT, or set the system date.\n" |
40 | "\nOptions:\n\t-R\t\toutput RFC-822 compliant date string\n" | 40 | "\nOptions:\n\t-R\t\toutput RFC-822 compliant date string\n" |
@@ -159,12 +159,6 @@ date_conv_ftime(struct tm *tm_time, const char *t_string) { | |||
159 | } | 159 | } |
160 | 160 | ||
161 | 161 | ||
162 | void | ||
163 | date_err(void) { | ||
164 | fprintf (stderr, "%s\n", date_usage); | ||
165 | exit( FALSE); | ||
166 | } | ||
167 | |||
168 | int | 162 | int |
169 | date_main(int argc, char * * argv) | 163 | date_main(int argc, char * * argv) |
170 | { | 164 | { |
@@ -190,7 +184,7 @@ date_main(int argc, char * * argv) | |||
190 | break; | 184 | break; |
191 | case 's': | 185 | case 's': |
192 | set_time = 1; | 186 | set_time = 1; |
193 | if(date_str != NULL) date_err(); | 187 | if(date_str != NULL) usage ( date_usage); |
194 | date_str = optarg; | 188 | date_str = optarg; |
195 | break; | 189 | break; |
196 | case 'u': | 190 | case 'u': |
@@ -202,11 +196,11 @@ date_main(int argc, char * * argv) | |||
202 | /* Look ma, no break. Don't fix it either. */ | 196 | /* Look ma, no break. Don't fix it either. */ |
203 | case 'd': | 197 | case 'd': |
204 | use_arg = 1; | 198 | use_arg = 1; |
205 | if(date_str != NULL) date_err(); | 199 | if(date_str != NULL) usage ( date_usage); |
206 | date_str = optarg; | 200 | date_str = optarg; |
207 | break; | 201 | break; |
208 | case '-': | 202 | case '-': |
209 | date_err(); | 203 | usage ( date_usage); |
210 | } | 204 | } |
211 | } else { | 205 | } else { |
212 | if ( (date_fmt == NULL) && (strcmp(*argv, "+")==0) ) | 206 | if ( (date_fmt == NULL) && (strcmp(*argv, "+")==0) ) |
@@ -215,7 +209,7 @@ date_main(int argc, char * * argv) | |||
215 | set_time = 1; | 209 | set_time = 1; |
216 | date_str=*argv; | 210 | date_str=*argv; |
217 | } else { | 211 | } else { |
218 | date_err(); | 212 | usage ( date_usage); |
219 | } | 213 | } |
220 | } | 214 | } |
221 | i--; | 215 | i--; |