summaryrefslogtreecommitdiff
path: root/time
diff options
context:
space:
mode:
Diffstat (limited to 'time')
-rw-r--r--time/strftime.c87
-rw-r--r--time/time.h2
-rw-r--r--time/zic.c18
3 files changed, 77 insertions, 30 deletions
diff --git a/time/strftime.c b/time/strftime.c
index fea545cd38..963e9e4e4d 100644
--- a/time/strftime.c
+++ b/time/strftime.c
@@ -85,23 +85,27 @@ extern char *tzname[];
#endif
#ifndef __P
-#if defined (__GNUC__) || (defined (__STDC__) && __STDC__)
-#define __P(args) args
-#else
-#define __P(args) ()
-#endif /* GCC. */
+# if defined (__GNUC__) || (defined (__STDC__) && __STDC__)
+# define __P(args) args
+# else
+# define __P(args) ()
+# endif /* GCC. */
#endif /* Not __P. */
#ifndef PTR
-#ifdef __STDC__
-#define PTR void *
-#else
-#define PTR char *
-#endif
+# ifdef __STDC__
+# define PTR void *
+# else
+# define PTR char *
+# endif
#endif
#ifndef CHAR_BIT
-#define CHAR_BIT 8
+# define CHAR_BIT 8
+#endif
+
+#ifndef NULL
+# define NULL 0
#endif
#define TYPE_SIGNED(t) ((t) -1 < 0)
@@ -119,7 +123,7 @@ extern char *tzname[];
#ifndef __isleap
/* Nonzero if YEAR is a leap year (every 4 years,
except every 100th isn't, and every 400th is). */
-#define __isleap(year) \
+# define __isleap(year) \
((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0))
#endif
@@ -134,7 +138,7 @@ extern int __tz_compute __P ((time_t timer, const struct tm *tm));
# if ! HAVE_LOCALTIME_R
# if ! HAVE_TM_GMTOFF
/* Approximate gmtime_r as best we can in its absence. */
-#define gmtime_r my_gmtime_r
+# define gmtime_r my_gmtime_r
static struct tm *gmtime_r __P ((const time_t *, struct tm *));
static struct tm *
gmtime_r (t, tp)
@@ -150,7 +154,7 @@ gmtime_r (t, tp)
# endif /* ! HAVE_TM_GMTOFF */
/* Approximate localtime_r as best we can in its absence. */
-#define localtime_r my_localtime_r
+# define localtime_r my_localtime_r
static struct tm *localtime_r __P ((const time_t *, struct tm *));
static struct tm *
localtime_r (t, tp)
@@ -194,23 +198,25 @@ static const char spaces[16] = " ";
{ \
int _n = (n); \
int _delta = width - _n; \
- i += _n + (_delta > 0 ? _delta : 0); \
- if (i >= maxsize) \
+ int _incr = _n + (_delta > 0 ? _delta : 0); \
+ if (i + _incr >= maxsize) \
return 0; \
- else \
- if (p) \
- { \
- if (_delta > 0) \
- memset_space (p, _delta); \
- f; \
- p += _n; \
- } \
+ if (p) \
+ { \
+ if (_delta > 0) \
+ memset_space (p, _delta); \
+ f; \
+ p += _n; \
+ } \
+ i += _incr; \
} while (0)
#define cpy(n, s) \
add ((n), \
if (to_lowcase) \
memcpy_lowcase (p, (s), _n); \
+ else if (to_uppcase) \
+ memcpy_uppcase (p, (s), _n); \
else \
memcpy ((PTR) p, (PTR) (s), _n))
@@ -237,6 +243,19 @@ memcpy_lowcase (dest, src, len)
return dest;
}
+static char *memcpy_uppcase __P ((char *dest, const char *src, size_t len));
+
+static char *
+memcpy_uppcase (dest, src, len)
+ char *dest;
+ const char *src;
+ size_t len;
+{
+ while (len-- > 0)
+ dest[len] = TOUPPER (src[len]);
+ return dest;
+}
+
#if ! HAVE_TM_GMTOFF
/* Yield the difference between *A and *B,
measured in seconds, ignoring leap seconds. */
@@ -393,6 +412,7 @@ strftime (s, maxsize, format, tp)
: INT_STRLEN_BOUND (int))];
int width = -1;
int to_lowcase = 0;
+ int to_uppcase = 0;
#if DO_MULTIBYTE
@@ -468,16 +488,19 @@ strftime (s, maxsize, format, tp)
#endif /* ! DO_MULTIBYTE */
/* Check for flags that can modify a number format. */
- ++f;
while (1)
{
- switch (*f)
+ switch (*++f)
{
case '_':
case '-':
case '0':
- pad = *f++;
- break;
+ pad = *f;
+ continue;
+
+ case '^':
+ to_uppcase = 1;
+ continue;
default:
pad = 0;
@@ -563,10 +586,18 @@ strftime (s, maxsize, format, tp)
subformat:
{
+ char *old_start = p;
size_t len = strftime (NULL, maxsize - i, subfmt, tp);
if (len == 0 && *subfmt)
return 0;
add (len, strftime (p, maxsize - i, subfmt, tp));
+
+ if (to_uppcase)
+ while (old_start < p)
+ {
+ *old_start = TOUPPER (*old_start);
+ ++old_start;
+ }
}
break;
diff --git a/time/time.h b/time/time.h
index 935de80c7a..e824e64b9d 100644
--- a/time/time.h
+++ b/time/time.h
@@ -265,10 +265,10 @@ extern int dysize __P ((int __year));
#endif
-#ifdef __USE_POSIX
/* Pause execution for a number of nanoseconds. */
extern int __nanosleep __P ((__const struct timespec *__requested_time,
struct timespec *__remaining));
+#ifdef __USE_POSIX199309
extern int nanosleep __P ((__const struct timespec *__requested_time,
struct timespec *__remaining));
#endif
diff --git a/time/zic.c b/time/zic.c
index a354a1ece3..f75834c6c3 100644
--- a/time/zic.c
+++ b/time/zic.c
@@ -1,6 +1,6 @@
#ifndef lint
#ifndef NOID
-static char elsieid[] = "@(#)zic.c 7.78";
+static char elsieid[] = "@(#)zic.c 7.79";
#endif /* !defined NOID */
#endif /* !defined lint */
@@ -359,6 +359,7 @@ char * const ptr;
{
if (ptr == NULL) {
const char *e = strerror(errno);
+
(void) fprintf(stderr, _("%s: Memory exhausted: %s\n"),
progname, e);
(void) exit(EXIT_FAILURE);
@@ -608,6 +609,7 @@ const char * const tofile;
(void) exit(EXIT_FAILURE);
if (link(fromname, toname) != 0) {
const char *e = strerror(errno);
+
(void) fprintf(stderr,
_("%s: Can't link from %s to %s: %s\n"),
progname, fromname, toname, e);
@@ -780,6 +782,7 @@ const char * name;
fp = stdin;
} else if ((fp = fopen(name, "r")) == NULL) {
const char *e = strerror(errno);
+
(void) fprintf(stderr, _("%s: Can't open %s: %s\n"),
progname, name, e);
(void) exit(EXIT_FAILURE);
@@ -848,6 +851,7 @@ _("%s: panic: Invalid l_value %d\n"),
}
if (fp != stdin && fclose(fp)) {
const char *e = strerror(errno);
+
(void) fprintf(stderr, _("%s: Error closing %s: %s\n"),
progname, filename, e);
(void) exit(EXIT_FAILURE);
@@ -1422,11 +1426,22 @@ const char * const name;
fullname = erealloc(fullname,
(int) (strlen(directory) + 1 + strlen(name) + 1));
(void) sprintf(fullname, "%s/%s", directory, name);
+ /*
+ ** Remove old file, if any, to snap links.
+ */
+ if (!itsdir(fullname) && remove(fullname) != 0 && errno != ENOENT) {
+ const char *e = strerror(errno);
+
+ (void) fprintf(stderr, _("%s: Can't remove %s: %s\n"),
+ progname, fullname, e);
+ (void) exit(EXIT_FAILURE);
+ }
if ((fp = fopen(fullname, "wb")) == NULL) {
if (mkdirs(fullname) != 0)
(void) exit(EXIT_FAILURE);
if ((fp = fopen(fullname, "wb")) == NULL) {
const char *e = strerror(errno);
+
(void) fprintf(stderr, _("%s: Can't create %s: %s\n"),
progname, fullname, e);
(void) exit(EXIT_FAILURE);
@@ -2114,6 +2129,7 @@ char * const argname;
*/
if (mkdir(name, 0755) != 0) {
const char *e = strerror(errno);
+
(void) fprintf(stderr,
_("%s: Can't create directory %s: %s\n"),
progname, name, e);
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-09 14:14:19 +0000