Module Name: othersrc
Committed By: dholland
Date: Mon Feb 25 02:53:33 UTC 2013
Modified Files:
othersrc/usr.bin/dholland-make2: portable.c util.c
Log Message:
Move the other compat stuff from util.c to portable.c.
(and the reason it isn't called compat.c is we already have one of those
for something quite different.)
Leave the environment wrangling code behind as I have someting else in
mind for that.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 othersrc/usr.bin/dholland-make2/portable.c
cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/usr.bin/dholland-make2/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/usr.bin/dholland-make2/portable.c
diff -u othersrc/usr.bin/dholland-make2/portable.c:1.1 othersrc/usr.bin/dholland-make2/portable.c:1.2
--- othersrc/usr.bin/dholland-make2/portable.c:1.1 Mon Feb 25 02:12:23 2013
+++ othersrc/usr.bin/dholland-make2/portable.c Mon Feb 25 02:53:33 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: portable.c,v 1.1 2013/02/25 02:12:23 dholland Exp $ */
+/* $NetBSD: portable.c,v 1.2 2013/02/25 02:53:33 dholland Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -28,17 +28,51 @@
#ifdef MAKE_NATIVE
#include <sys/cdefs.h>
-__RCSID("$NetBSD: portable.c,v 1.1 2013/02/25 02:12:23 dholland Exp $");
+__RCSID("$NetBSD: portable.c,v 1.2 2013/02/25 02:53:33 dholland Exp $");
#endif
+#include <sys/param.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <signal.h>
#include <errno.h>
#include "portable.h"
#include "make.h"
+#ifdef MAKE_NATIVE
+#define HAVE_STRERROR
+#define HAVE_VSNPRINTF
+#define HAVE_STRFTIME
+#endif
+
+////////////////////////////////////////////////////////////
+// 1. Things we always intercept (bmake_*)
+
+//////////////////////////////
+// signals
+
+/* force posix signals */
+void (*
+bmake_signal(int s, void (*a)(int)))(int)
+{
+ struct sigaction sa, osa;
+
+ sa.sa_handler = a;
+ sigemptyset(&sa.sa_mask);
+ sa.sa_flags = SA_RESTART;
+
+ if (sigaction(s, &sa, &osa) == -1)
+ return SIG_ERR;
+ else
+ return osa.sa_handler;
+}
+
+//////////////////////////////
+// (e)malloc
+
#ifndef USE_EMALLOC
static void enomem(void) MAKE_ATTR_DEAD;
@@ -118,3 +152,375 @@ bmake_realloc(void *ptr, size_t size)
return(ptr);
}
#endif
+
+////////////////////////////////////////////////////////////
+// 2. standard functions sometimes missing
+// (in alphabetical order)
+
+
+//////////////////////////////
+// getwd, req'd on hpux
+
+#if defined(__hpux__) || defined(__hpux)
+
+#include <sys/types.h>
+#include <sys/syscall.h>
+#include <sys/signal.h>
+#include <sys/stat.h>
+#include <dirent.h>
+#include <sys/time.h>
+#include <unistd.h>
+
+/* strrcpy():
+ * Like strcpy, going backwards and returning the new pointer
+ */
+static char *
+strrcpy(char *ptr, char *str)
+{
+ int len = strlen(str);
+
+ while (len)
+ *--ptr = str[--len];
+
+ return (ptr);
+} /* end strrcpy */
+
+#if !defined(BSD) && !defined(d_fileno)
+# define d_fileno d_ino
+#endif
+
+#ifndef DEV_DEV_COMPARE
+# define DEV_DEV_COMPARE(a, b) ((a) == (b))
+#endif
+#define ISDOT(c) ((c)[0] == '.' && (((c)[1] == '\0') || ((c)[1] == '/')))
+#define ISDOTDOT(c) ((c)[0] == '.' && ISDOT(&((c)[1])))
+
+char *
+getwd(char *pathname)
+{
+ DIR *dp;
+ struct dirent *d;
+ extern int errno;
+
+ struct stat st_root, st_cur, st_next, st_dotdot;
+ char pathbuf[MAXPATHLEN], nextpathbuf[MAXPATHLEN * 2];
+ char *pathptr, *nextpathptr, *cur_name_add;
+
+ /* find the inode of root */
+ if (stat("/", &st_root) == -1) {
+ (void)sprintf(pathname,
+ "getwd: Cannot stat \"/\" (%s)", strerror(errno));
+ return NULL;
+ }
+ pathbuf[MAXPATHLEN - 1] = '\0';
+ pathptr = &pathbuf[MAXPATHLEN - 1];
+ nextpathbuf[MAXPATHLEN - 1] = '\0';
+ cur_name_add = nextpathptr = &nextpathbuf[MAXPATHLEN - 1];
+
+ /* find the inode of the current directory */
+ if (lstat(".", &st_cur) == -1) {
+ (void)sprintf(pathname,
+ "getwd: Cannot stat \".\" (%s)", strerror(errno));
+ return NULL;
+ }
+ nextpathptr = strrcpy(nextpathptr, "../");
+
+ /* Descend to root */
+ for (;;) {
+
+ /* look if we found root yet */
+ if (st_cur.st_ino == st_root.st_ino &&
+ DEV_DEV_COMPARE(st_cur.st_dev, st_root.st_dev)) {
+ (void)strcpy(pathname, *pathptr != '/' ? "/" : pathptr);
+ return (pathname);
+ }
+
+ /* open the parent directory */
+ if (stat(nextpathptr, &st_dotdot) == -1) {
+ (void)sprintf(pathname,
+ "getwd: Cannot stat directory \"%s\" (%s)",
+ nextpathptr, strerror(errno));
+ return NULL;
+ }
+ if ((dp = opendir(nextpathptr)) == NULL) {
+ (void)sprintf(pathname,
+ "getwd: Cannot open directory \"%s\" (%s)",
+ nextpathptr, strerror(errno));
+ return NULL;
+ }
+
+ /* look in the parent for the entry with the same inode */
+ if (DEV_DEV_COMPARE(st_dotdot.st_dev, st_cur.st_dev)) {
+ /* Parent has same device. No need to stat every member */
+ for (d = readdir(dp); d != NULL; d = readdir(dp))
+ if (d->d_fileno == st_cur.st_ino)
+ break;
+ }
+ else {
+ /*
+ * Parent has a different device. This is a mount point so we
+ * need to stat every member
+ */
+ for (d = readdir(dp); d != NULL; d = readdir(dp)) {
+ if (ISDOT(d->d_name) || ISDOTDOT(d->d_name))
+ continue;
+ (void)strcpy(cur_name_add, d->d_name);
+ if (lstat(nextpathptr, &st_next) == -1) {
+ (void)sprintf(pathname,
+ "getwd: Cannot stat \"%s\" (%s)",
+ d->d_name, strerror(errno));
+ (void)closedir(dp);
+ return NULL;
+ }
+ /* check if we found it yet */
+ if (st_next.st_ino == st_cur.st_ino &&
+ DEV_DEV_COMPARE(st_next.st_dev, st_cur.st_dev))
+ break;
+ }
+ }
+ if (d == NULL) {
+ (void)sprintf(pathname,
+ "getwd: Cannot find \".\" in \"..\"");
+ (void)closedir(dp);
+ return NULL;
+ }
+ st_cur = st_dotdot;
+ pathptr = strrcpy(pathptr, d->d_name);
+ pathptr = strrcpy(pathptr, "/");
+ nextpathptr = strrcpy(nextpathptr, "../");
+ (void)closedir(dp);
+ *cur_name_add = '\0';
+ }
+} /* end getwd */
+#endif /* __hpux */
+
+//////////////////////////////
+// killpg (needed on hpux)
+
+#if defined(__hpux__) || defined(__hpux)
+int
+killpg(int pid, int sig)
+{
+ return kill(-pid, sig);
+}
+#endif
+
+//////////////////////////////
+// random
+// not needed any more
+
+#if 0 /* used to be needed on hpux */
+void
+srandom(long seed)
+{
+ srand48(seed);
+}
+
+long
+random(void)
+{
+ return lrand48();
+}
+#endif
+
+//////////////////////////////
+// snprintf
+// probed; controlled by HAVE_VSNPRINTF
+
+#if !defined(HAVE_VSNPRINTF)
+#include <stdarg.h>
+
+#if !defined(__osf__)
+#ifdef _IOSTRG
+#define STRFLAG (_IOSTRG|_IOWRT) /* no _IOWRT: avoid stdio bug */
+#else
+#if 0
+#define STRFLAG (_IOREAD) /* XXX: Assume svr4 stdio */
+#endif
+#endif /* _IOSTRG */
+#endif /* __osf__ */
+
+int
+vsnprintf(char *s, size_t n, const char *fmt, va_list args)
+{
+#ifdef STRFLAG
+ FILE fakebuf;
+
+ fakebuf._flag = STRFLAG;
+ /*
+ * Some os's are char * _ptr, others are unsigned char *_ptr...
+ * We cast to void * to make everyone happy.
+ */
+ fakebuf._ptr = (void *)s;
+ fakebuf._cnt = n-1;
+ fakebuf._file = -1;
+ _doprnt(fmt, args, &fakebuf);
+ fakebuf._cnt++;
+ putc('\0', &fakebuf);
+ if (fakebuf._cnt<0)
+ fakebuf._cnt = 0;
+ return (n-fakebuf._cnt-1);
+#else
+ (void)vsprintf(s, fmt, args);
+ return strlen(s);
+#endif
+}
+
+int
+snprintf(char *s, size_t n, const char *fmt, ...)
+{
+ va_list ap;
+ int rv;
+
+ va_start(ap, fmt);
+ rv = vsnprintf(s, n, fmt, ap);
+ va_end(ap);
+ return rv;
+}
+
+#endif /* HAVE_VSNPRINTF */
+
+//////////////////////////////
+// strerror
+// probed; controlled by HAVE_STRERROR
+
+#if !defined(HAVE_STRERROR)
+extern int errno, sys_nerr;
+extern char *sys_errlist[];
+
+char *
+strerror(int e)
+{
+ static char buf[100];
+ if (e < 0 || e >= sys_nerr) {
+ snprintf(buf, sizeof(buf), "Unknown error %d", e);
+ return buf;
+ }
+ else
+ return sys_errlist[e];
+}
+#endif
+
+//////////////////////////////
+// strftime
+// probed; controlled by HAVE_STRFTIME
+
+#if !defined(HAVE_STRFTIME)
+#include <time.h>
+size_t
+strftime(char *buf, size_t len, const char *fmt, const struct tm *tm)
+{
+ static char months[][4] = {
+ "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+ "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+ };
+
+ size_t s;
+ char *b = buf;
+
+ while (*fmt) {
+ if (len == 0)
+ return buf - b;
+ if (*fmt != '%') {
+ *buf++ = *fmt++;
+ len--;
+ continue;
+ }
+ switch (*fmt++) {
+ case '%':
+ *buf++ = '%';
+ len--;
+ if (len == 0) return buf - b;
+ /*FALLTHROUGH*/
+ case '\0':
+ *buf = '%';
+ s = 1;
+ break;
+ case 'k':
+ s = snprintf(buf, len, "%d", tm->tm_hour);
+ break;
+ case 'M':
+ s = snprintf(buf, len, "%02d", tm->tm_min);
+ break;
+ case 'S':
+ s = snprintf(buf, len, "%02d", tm->tm_sec);
+ break;
+ case 'b':
+ if (tm->tm_mon >= 12)
+ return buf - b;
+ s = snprintf(buf, len, "%s", months[tm->tm_mon]);
+ break;
+ case 'd':
+ s = snprintf(buf, len, "%02d", tm->tm_mday);
+ break;
+ case 'Y':
+ s = snprintf(buf, len, "%d", 1900 + tm->tm_year);
+ break;
+ default:
+ s = snprintf(buf, len, "Unsupported format %c",
+ fmt[-1]);
+ break;
+ }
+ buf += s;
+ len -= s;
+ }
+}
+#endif
+
+//////////////////////////////
+// sys_siglist
+// This has been provided on hpux, but does not seem to be used.
+
+#if defined(__hpux__) || defined(__hpux)
+char *sys_siglist[] = {
+ "Signal 0",
+ "Hangup", /* SIGHUP */
+ "Interrupt", /* SIGINT */
+ "Quit", /* SIGQUIT */
+ "Illegal instruction", /* SIGILL */
+ "Trace/BPT trap", /* SIGTRAP */
+ "IOT trap", /* SIGIOT */
+ "EMT trap", /* SIGEMT */
+ "Floating point exception", /* SIGFPE */
+ "Killed", /* SIGKILL */
+ "Bus error", /* SIGBUS */
+ "Segmentation fault", /* SIGSEGV */
+ "Bad system call", /* SIGSYS */
+ "Broken pipe", /* SIGPIPE */
+ "Alarm clock", /* SIGALRM */
+ "Terminated", /* SIGTERM */
+ "User defined signal 1", /* SIGUSR1 */
+ "User defined signal 2", /* SIGUSR2 */
+ "Child exited", /* SIGCLD */
+ "Power-fail restart", /* SIGPWR */
+ "Virtual timer expired", /* SIGVTALRM */
+ "Profiling timer expired", /* SIGPROF */
+ "I/O possible", /* SIGIO */
+ "Window size changes", /* SIGWINDOW */
+ "Stopped (signal)", /* SIGSTOP */
+ "Stopped", /* SIGTSTP */
+ "Continued", /* SIGCONT */
+ "Stopped (tty input)", /* SIGTTIN */
+ "Stopped (tty output)", /* SIGTTOU */
+ "Urgent I/O condition", /* SIGURG */
+ "Remote lock lost (NFS)", /* SIGLOST */
+ "Signal 31", /* reserved */
+ "DIL signal" /* SIGDIL */
+};
+#endif
+
+//////////////////////////////
+// utimes
+// not needed any more
+
+#if 0 /* used to be needed on hpux */
+int
+utimes(char *file, struct timeval tvp[2])
+{
+ struct utimbuf t;
+
+ t.actime = tvp[0].tv_sec;
+ t.modtime = tvp[1].tv_sec;
+ return(utime(file, &t));
+}
+#endif
Index: othersrc/usr.bin/dholland-make2/util.c
diff -u othersrc/usr.bin/dholland-make2/util.c:1.1.1.1 othersrc/usr.bin/dholland-make2/util.c:1.2
--- othersrc/usr.bin/dholland-make2/util.c:1.1.1.1 Mon Feb 25 01:33:07 2013
+++ othersrc/usr.bin/dholland-make2/util.c Mon Feb 25 02:53:33 2013
@@ -1,15 +1,15 @@
-/* $NetBSD: util.c,v 1.1.1.1 2013/02/25 01:33:07 dholland Exp $ */
+/* $NetBSD: util.c,v 1.2 2013/02/25 02:53:33 dholland Exp $ */
/*
* Missing stuff from OS's
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: util.c,v 1.1.1.1 2013/02/25 01:33:07 dholland Exp $";
+static char rcsid[] = "$NetBSD: util.c,v 1.2 2013/02/25 02:53:33 dholland Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: util.c,v 1.1.1.1 2013/02/25 01:33:07 dholland Exp $");
+__RCSID("$NetBSD: util.c,v 1.2 2013/02/25 02:53:33 dholland Exp $");
#endif
#endif
@@ -22,23 +22,6 @@ __RCSID("$NetBSD: util.c,v 1.1.1.1 2013/
#include "make.h"
-#if !defined(MAKE_NATIVE) && !defined(HAVE_STRERROR)
-extern int errno, sys_nerr;
-extern char *sys_errlist[];
-
-char *
-strerror(int e)
-{
- static char buf[100];
- if (e < 0 || e >= sys_nerr) {
- snprintf(buf, sizeof(buf), "Unknown error %d", e);
- return buf;
- }
- else
- return sys_errlist[e];
-}
-#endif
-
#if !defined(MAKE_NATIVE) && !defined(HAVE_SETENV)
extern char **environ;
@@ -158,334 +141,3 @@ main(int argc, char *argv[])
#endif
#endif
-
-#if defined(__hpux__) || defined(__hpux)
-/* strrcpy():
- * Like strcpy, going backwards and returning the new pointer
- */
-static char *
-strrcpy(char *ptr, char *str)
-{
- int len = strlen(str);
-
- while (len)
- *--ptr = str[--len];
-
- return (ptr);
-} /* end strrcpy */
-
-char *sys_siglist[] = {
- "Signal 0",
- "Hangup", /* SIGHUP */
- "Interrupt", /* SIGINT */
- "Quit", /* SIGQUIT */
- "Illegal instruction", /* SIGILL */
- "Trace/BPT trap", /* SIGTRAP */
- "IOT trap", /* SIGIOT */
- "EMT trap", /* SIGEMT */
- "Floating point exception", /* SIGFPE */
- "Killed", /* SIGKILL */
- "Bus error", /* SIGBUS */
- "Segmentation fault", /* SIGSEGV */
- "Bad system call", /* SIGSYS */
- "Broken pipe", /* SIGPIPE */
- "Alarm clock", /* SIGALRM */
- "Terminated", /* SIGTERM */
- "User defined signal 1", /* SIGUSR1 */
- "User defined signal 2", /* SIGUSR2 */
- "Child exited", /* SIGCLD */
- "Power-fail restart", /* SIGPWR */
- "Virtual timer expired", /* SIGVTALRM */
- "Profiling timer expired", /* SIGPROF */
- "I/O possible", /* SIGIO */
- "Window size changes", /* SIGWINDOW */
- "Stopped (signal)", /* SIGSTOP */
- "Stopped", /* SIGTSTP */
- "Continued", /* SIGCONT */
- "Stopped (tty input)", /* SIGTTIN */
- "Stopped (tty output)", /* SIGTTOU */
- "Urgent I/O condition", /* SIGURG */
- "Remote lock lost (NFS)", /* SIGLOST */
- "Signal 31", /* reserved */
- "DIL signal" /* SIGDIL */
-};
-#endif /* __hpux__ || __hpux */
-
-#if defined(__hpux__) || defined(__hpux)
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <sys/signal.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <sys/time.h>
-#include <unistd.h>
-
-int
-killpg(int pid, int sig)
-{
- return kill(-pid, sig);
-}
-
-#if !defined(__hpux__) && !defined(__hpux)
-void
-srandom(long seed)
-{
- srand48(seed);
-}
-
-long
-random(void)
-{
- return lrand48();
-}
-#endif
-
-#if !defined(__hpux__) && !defined(__hpux)
-int
-utimes(char *file, struct timeval tvp[2])
-{
- struct utimbuf t;
-
- t.actime = tvp[0].tv_sec;
- t.modtime = tvp[1].tv_sec;
- return(utime(file, &t));
-}
-#endif
-
-#if !defined(BSD) && !defined(d_fileno)
-# define d_fileno d_ino
-#endif
-
-#ifndef DEV_DEV_COMPARE
-# define DEV_DEV_COMPARE(a, b) ((a) == (b))
-#endif
-#define ISDOT(c) ((c)[0] == '.' && (((c)[1] == '\0') || ((c)[1] == '/')))
-#define ISDOTDOT(c) ((c)[0] == '.' && ISDOT(&((c)[1])))
-
-char *
-getwd(char *pathname)
-{
- DIR *dp;
- struct dirent *d;
- extern int errno;
-
- struct stat st_root, st_cur, st_next, st_dotdot;
- char pathbuf[MAXPATHLEN], nextpathbuf[MAXPATHLEN * 2];
- char *pathptr, *nextpathptr, *cur_name_add;
-
- /* find the inode of root */
- if (stat("/", &st_root) == -1) {
- (void)sprintf(pathname,
- "getwd: Cannot stat \"/\" (%s)", strerror(errno));
- return NULL;
- }
- pathbuf[MAXPATHLEN - 1] = '\0';
- pathptr = &pathbuf[MAXPATHLEN - 1];
- nextpathbuf[MAXPATHLEN - 1] = '\0';
- cur_name_add = nextpathptr = &nextpathbuf[MAXPATHLEN - 1];
-
- /* find the inode of the current directory */
- if (lstat(".", &st_cur) == -1) {
- (void)sprintf(pathname,
- "getwd: Cannot stat \".\" (%s)", strerror(errno));
- return NULL;
- }
- nextpathptr = strrcpy(nextpathptr, "../");
-
- /* Descend to root */
- for (;;) {
-
- /* look if we found root yet */
- if (st_cur.st_ino == st_root.st_ino &&
- DEV_DEV_COMPARE(st_cur.st_dev, st_root.st_dev)) {
- (void)strcpy(pathname, *pathptr != '/' ? "/" : pathptr);
- return (pathname);
- }
-
- /* open the parent directory */
- if (stat(nextpathptr, &st_dotdot) == -1) {
- (void)sprintf(pathname,
- "getwd: Cannot stat directory \"%s\" (%s)",
- nextpathptr, strerror(errno));
- return NULL;
- }
- if ((dp = opendir(nextpathptr)) == NULL) {
- (void)sprintf(pathname,
- "getwd: Cannot open directory \"%s\" (%s)",
- nextpathptr, strerror(errno));
- return NULL;
- }
-
- /* look in the parent for the entry with the same inode */
- if (DEV_DEV_COMPARE(st_dotdot.st_dev, st_cur.st_dev)) {
- /* Parent has same device. No need to stat every member */
- for (d = readdir(dp); d != NULL; d = readdir(dp))
- if (d->d_fileno == st_cur.st_ino)
- break;
- }
- else {
- /*
- * Parent has a different device. This is a mount point so we
- * need to stat every member
- */
- for (d = readdir(dp); d != NULL; d = readdir(dp)) {
- if (ISDOT(d->d_name) || ISDOTDOT(d->d_name))
- continue;
- (void)strcpy(cur_name_add, d->d_name);
- if (lstat(nextpathptr, &st_next) == -1) {
- (void)sprintf(pathname,
- "getwd: Cannot stat \"%s\" (%s)",
- d->d_name, strerror(errno));
- (void)closedir(dp);
- return NULL;
- }
- /* check if we found it yet */
- if (st_next.st_ino == st_cur.st_ino &&
- DEV_DEV_COMPARE(st_next.st_dev, st_cur.st_dev))
- break;
- }
- }
- if (d == NULL) {
- (void)sprintf(pathname,
- "getwd: Cannot find \".\" in \"..\"");
- (void)closedir(dp);
- return NULL;
- }
- st_cur = st_dotdot;
- pathptr = strrcpy(pathptr, d->d_name);
- pathptr = strrcpy(pathptr, "/");
- nextpathptr = strrcpy(nextpathptr, "../");
- (void)closedir(dp);
- *cur_name_add = '\0';
- }
-} /* end getwd */
-#endif /* __hpux */
-
-/* force posix signals */
-void (*
-bmake_signal(int s, void (*a)(int)))(int)
-{
- struct sigaction sa, osa;
-
- sa.sa_handler = a;
- sigemptyset(&sa.sa_mask);
- sa.sa_flags = SA_RESTART;
-
- if (sigaction(s, &sa, &osa) == -1)
- return SIG_ERR;
- else
- return osa.sa_handler;
-}
-
-#if !defined(MAKE_NATIVE) && !defined(HAVE_VSNPRINTF)
-#include <stdarg.h>
-
-#if !defined(__osf__)
-#ifdef _IOSTRG
-#define STRFLAG (_IOSTRG|_IOWRT) /* no _IOWRT: avoid stdio bug */
-#else
-#if 0
-#define STRFLAG (_IOREAD) /* XXX: Assume svr4 stdio */
-#endif
-#endif /* _IOSTRG */
-#endif /* __osf__ */
-
-int
-vsnprintf(char *s, size_t n, const char *fmt, va_list args)
-{
-#ifdef STRFLAG
- FILE fakebuf;
-
- fakebuf._flag = STRFLAG;
- /*
- * Some os's are char * _ptr, others are unsigned char *_ptr...
- * We cast to void * to make everyone happy.
- */
- fakebuf._ptr = (void *)s;
- fakebuf._cnt = n-1;
- fakebuf._file = -1;
- _doprnt(fmt, args, &fakebuf);
- fakebuf._cnt++;
- putc('\0', &fakebuf);
- if (fakebuf._cnt<0)
- fakebuf._cnt = 0;
- return (n-fakebuf._cnt-1);
-#else
- (void)vsprintf(s, fmt, args);
- return strlen(s);
-#endif
-}
-
-int
-snprintf(char *s, size_t n, const char *fmt, ...)
-{
- va_list ap;
- int rv;
-
- va_start(ap, fmt);
- rv = vsnprintf(s, n, fmt, ap);
- va_end(ap);
- return rv;
-}
-
-#if !defined(MAKE_NATIVE) && !defined(HAVE_STRFTIME)
-size_t
-strftime(char *buf, size_t len, const char *fmt, const struct tm *tm)
-{
- static char months[][4] = {
- "Jan", "Feb", "Mar", "Apr", "May", "Jun",
- "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
- };
-
- size_t s;
- char *b = buf;
-
- while (*fmt) {
- if (len == 0)
- return buf - b;
- if (*fmt != '%') {
- *buf++ = *fmt++;
- len--;
- continue;
- }
- switch (*fmt++) {
- case '%':
- *buf++ = '%';
- len--;
- if (len == 0) return buf - b;
- /*FALLTHROUGH*/
- case '\0':
- *buf = '%';
- s = 1;
- break;
- case 'k':
- s = snprintf(buf, len, "%d", tm->tm_hour);
- break;
- case 'M':
- s = snprintf(buf, len, "%02d", tm->tm_min);
- break;
- case 'S':
- s = snprintf(buf, len, "%02d", tm->tm_sec);
- break;
- case 'b':
- if (tm->tm_mon >= 12)
- return buf - b;
- s = snprintf(buf, len, "%s", months[tm->tm_mon]);
- break;
- case 'd':
- s = snprintf(buf, len, "%02d", tm->tm_mday);
- break;
- case 'Y':
- s = snprintf(buf, len, "%d", 1900 + tm->tm_year);
- break;
- default:
- s = snprintf(buf, len, "Unsupported format %c",
- fmt[-1]);
- break;
- }
- buf += s;
- len -= s;
- }
-}
-#endif
-#endif
