|
Marcela Mašláňová |
82024f |
diff -up at-3.1.10/at.c.nonposix at-3.1.10/at.c
|
|
Marcela Mašláňová |
82024f |
--- at-3.1.10/at.c.nonposix 2008-03-25 14:54:09.000000000 +0100
|
|
Marcela Mašláňová |
82024f |
+++ at-3.1.10/at.c 2008-03-25 14:57:46.000000000 +0100
|
|
Marcela Mašláňová |
82024f |
@@ -92,6 +92,7 @@
|
|
Marcela Mašláňová |
82024f |
#define SIZE 255
|
|
Marcela Mašláňová |
82024f |
|
|
Marcela Mašláňová |
82024f |
#define TIMEFORMAT_POSIX "%a %b %e %T %Y"
|
|
Marcela Mašláňová |
82024f |
+#define TIMEFORMAT_ISO "%Y-%m-%d %H:%M"
|
|
Marcela Mašláňová |
82024f |
#define TIMESIZE 50
|
|
Marcela Mašláňová |
82024f |
|
|
Marcela Mašláňová |
82024f |
enum {
|
|
Marcela Mašláňová |
82024f |
@@ -490,7 +491,15 @@ writefile(time_t runtimer, char queue)
|
|
Marcela Mašláňová |
82024f |
|
|
Marcela Mašláňová |
82024f |
runtime = localtime(&runtimer);
|
|
Marcela Mašláňová |
82024f |
|
|
Marcela Mašláňová |
82024f |
- strftime(timestr, TIMESIZE, TIMEFORMAT_POSIX, runtime);
|
|
Marcela Mašláňová |
82024f |
+ /* We only use the sick POSIX time format if POSIXLY_CORRECT
|
|
Marcela Mašláňová |
82024f |
+ is set. Otherwise, we use ISO format.
|
|
Marcela Mašláňová |
82024f |
+ */
|
|
Marcela Mašláňová |
82024f |
+
|
|
Marcela Mašláňová |
82024f |
+ if (getenv("POSIXLY_CORRECT") != NULL) {
|
|
Marcela Mašláňová |
82024f |
+ strftime(timestr, TIMESIZE, TIMEFORMAT_POSIX, runtime);
|
|
Marcela Mašláňová |
82024f |
+ } else {
|
|
Marcela Mašláňová |
82024f |
+ strftime(timestr, TIMESIZE, TIMEFORMAT_ISO, runtime);
|
|
Marcela Mašláňová |
82024f |
+ }
|
|
Marcela Mašláňová |
82024f |
fprintf(stderr, "job %ld at %s\n", jobno, timestr);
|
|
Marcela Mašláňová |
82024f |
|
|
Marcela Mašláňová |
82024f |
/* Signal atd, if present. Usual precautions taken... */
|
|
Marcela Mašláňová |
82024f |
@@ -588,8 +597,11 @@ list_jobs(void)
|
|
Marcela Mašláňová |
82024f |
runtimer = 60 * (time_t) ctm;
|
|
Marcela Mašláňová |
82024f |
runtime = localtime(&runtimer);
|
|
Marcela Mašláňová |
82024f |
|
|
Marcela Mašláňová |
82024f |
- strftime(timestr, TIMESIZE, TIMEFORMAT_POSIX, runtime);
|
|
Marcela Mašláňová |
82024f |
-
|
|
Marcela Mašláňová |
82024f |
+ if (getenv("POSIXLY_CORRECT") != NULL) {
|
|
Marcela Mašláňová |
82024f |
+ strftime(timestr, TIMESIZE, TIMEFORMAT_POSIX, runtime);
|
|
Marcela Mašláňová |
82024f |
+ } else {
|
|
Marcela Mašláňová |
82024f |
+ strftime(timestr, TIMESIZE, TIMEFORMAT_ISO, runtime);
|
|
Marcela Mašláňová |
82024f |
+ }
|
|
Marcela Mašláňová |
82024f |
if ((pwd = getpwuid(buf.st_uid)))
|
|
Marcela Mašláňová |
82024f |
printf("%ld\t%s %c %s\n", jobno, timestr, queue, pwd->pw_name);
|
|
Marcela Mašláňová |
82024f |
else
|