summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2000-10-27 21:40:35 +0000
committerEric Andersen <andersen@codepoet.org>2000-10-27 21:40:35 +0000
commitab262188b031c842ae09b15b150600287ead45cc (patch)
tree298ed601fc88cee59b319ff4496c927565de9acb
parent8fee51d63a5ca4a119850c9831a7219fe496df6c (diff)
More random fixes and additions.
-rw-r--r--include/netdb.h1
-rw-r--r--include/netinet/in.h18
-rw-r--r--libc/inet/Makefile2
-rw-r--r--libc/inet/hostid.c74
-rw-r--r--libc/misc/Makefile2
-rw-r--r--libc/misc/time/Makefile3
-rw-r--r--libc/misc/time/strftime.c398
-rw-r--r--libc/stdlib/Makefile2
-rw-r--r--libc/sysdeps/linux/common/syscalls.c8
-rw-r--r--libc/unistd/.indent.pro33
-rw-r--r--test/Makefile1
-rw-r--r--test/silly/.cvsignore2
-rw-r--r--test/silly/tiny.c8
13 files changed, 535 insertions, 17 deletions
diff --git a/include/netdb.h b/include/netdb.h
index f332a7c59..3a2d62446 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -64,6 +64,7 @@
#include <paths.h>
+#define __PATH_ETC_INET "/etc"
#define _PATH_HEQUIV __PATH_ETC_INET"/hosts.equiv"
#define _PATH_HOSTS __PATH_ETC_INET"/hosts"
#define _PATH_NETWORKS __PATH_ETC_INET"/networks"
diff --git a/include/netinet/in.h b/include/netinet/in.h
index 3dea92632..0fc347a4c 100644
--- a/include/netinet/in.h
+++ b/include/netinet/in.h
@@ -223,6 +223,8 @@ struct ipv6_mreq
/* Get system-specific definitions. */
#include <bits/in.h>
+#include <endian.h>
+#include <bits/byteswap.h>
/* Functions to convert between host and network byte order.
@@ -231,17 +233,7 @@ struct ipv6_mreq
this was a short-sighted decision since on different systems the types
may have different representations but the values are always the same. */
-extern uint32_t ntohl __P ((uint32_t __netlong));
-extern uint16_t ntohs __P ((uint16_t __netshort));
-extern uint32_t htonl __P ((uint32_t __hostlong));
-extern uint16_t htons __P ((uint16_t __hostshort));
-
-#include <endian.h>
-
-/* Get machine dependent optimized versions of byte swapping functions. */
-#include <bits/byteswap.h>
-
-#if __BYTE_ORDER == __BIG_ENDIAN && defined __OPTIMIZE__
+#if __BYTE_ORDER == __BIG_ENDIAN
/* The host byte order is the same as network byte order,
so these functions are all just identity. */
# define ntohl(x) (x)
@@ -249,11 +241,13 @@ extern uint16_t htons __P ((uint16_t __hostshort));
# define htonl(x) (x)
# define htons(x) (x)
#else
-# if __BYTE_ORDER == __LITTLE_ENDIAN && defined __OPTIMIZE__
+# if __BYTE_ORDER == __LITTLE_ENDIAN
# define ntohl(x) __bswap_32 (x)
# define ntohs(x) __bswap_16 (x)
# define htonl(x) __bswap_32 (x)
# define htons(x) __bswap_16 (x)
+# else
+# error "What kind of system is this?"
# endif
#endif
diff --git a/libc/inet/Makefile b/libc/inet/Makefile
index e5f11ee51..1e9ac365d 100644
--- a/libc/inet/Makefile
+++ b/libc/inet/Makefile
@@ -41,7 +41,7 @@ MOBJ3= accept.o bind.o connect.o getpeername.o getsockname.o getsockopt.o \
listen.o recv.o recvfrom.o recvmsg.o send.o sendmsg.o sendto.o \
setsockopt.o shutdown.o socket.o socketpair.o
-CSRC =getservice.c getproto.c
+CSRC =getservice.c getproto.c hostid.c
COBJS=$(patsubst %.c,%.o, $(CSRC))
OBJS=$(MOBJ) $(MOBJ2) $(MOBJ3) $(COBJS)
diff --git a/libc/inet/hostid.c b/libc/inet/hostid.c
new file mode 100644
index 000000000..475eaf497
--- /dev/null
+++ b/libc/inet/hostid.c
@@ -0,0 +1,74 @@
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <sys/param.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+
+#define HOSTID "/etc/hostid"
+
+int sethostid(long int new_id)
+{
+ int fd;
+ int ret;
+
+ if (geteuid() || getuid()) return errno=EPERM;
+ if ((fd=open(HOSTID,O_CREAT|O_WRONLY,0644))<0) return -1;
+ ret = write(fd,(void *)&new_id,sizeof(new_id)) == sizeof(new_id)
+ ? 0 : -1;
+ close (fd);
+ return ret;
+}
+
+long int gethostid(void)
+{
+ char host[MAXHOSTNAMELEN + 1];
+ int fd, id;
+
+ /* If hostid was already set the we can return that value.
+ * It is not an error if we cannot read this file. It is not even an
+ * error if we cannot read all the bytes, we just carry on trying...
+ */
+ if ((fd=open(HOSTID,O_RDONLY))>=0 && read(fd,(void *)&id,sizeof(id)))
+ {
+ close (fd);
+ return id;
+ }
+ if (fd >= 0) close (fd);
+
+ /* Try some methods of returning a unique 32 bit id. Clearly IP
+ * numbers, if on the internet, will have a unique address. If they
+ * are not on the internet then we can return 0 which means they should
+ * really set this number via a sethostid() call. If their hostname
+ * returns the loopback number (i.e. if they have put their hostname
+ * in the /etc/hosts file with 127.0.0.1) then all such hosts will
+ * have a non-unique hostid, but it doesn't matter anyway and
+ * gethostid() will return a non zero number without the need for
+ * setting one anyway.
+ * Mitch
+ */
+ if (gethostname(host,MAXHOSTNAMELEN)>=0 && *host) {
+ struct hostent *hp;
+ struct in_addr in;
+
+ if ((hp = gethostbyname(host)) == (struct hostent *)NULL)
+
+ /* This is not a error if we get here, as all it means is that
+ * this host is not on a network and/or they have not
+ * configured their network properly. So we return the unset
+ * hostid which should be 0, meaning that they should set it !!
+ */
+ return 0;
+ else {
+ memcpy((char *) &in, (char *) hp->h_addr, hp->h_length);
+
+ /* Just so it doesn't look exactly like the IP addr */
+ return(in.s_addr<<16|in.s_addr>>16);
+ }
+ }
+ else return 0;
+
+}
diff --git a/libc/misc/Makefile b/libc/misc/Makefile
index 9907f2d99..7ff8da188 100644
--- a/libc/misc/Makefile
+++ b/libc/misc/Makefile
@@ -35,7 +35,7 @@ tags:
ctags -R
clean: subdirs_clean
- rm -f libc.a
+ rm -f *.[oa] *~ core
subdirs: $(patsubst %, _dir_%, $(DIRS))
subdirs_clean: $(patsubst %, _dirclean_%, $(DIRS))
diff --git a/libc/misc/time/Makefile b/libc/misc/time/Makefile
index 76adb2e2f..0d24f43e4 100644
--- a/libc/misc/time/Makefile
+++ b/libc/misc/time/Makefile
@@ -25,7 +25,8 @@ include $(TOPDIR)Rules.mak
LIBC=$(TOPDIR)libc.a
CSRC=localtime.c gmtime.c asctime.c ctime.c asc_conv.c tm_conv.c mktime.c \
- localtime_r.c gmtime_r.c asctime_r.c ctime_r.c utimes.c adjtime.c
+ localtime_r.c gmtime_r.c asctime_r.c ctime_r.c utimes.c adjtime.c \
+ strftime.c
COBJS=$(patsubst %.c,%.o, $(CSRC))
OBJS=$(COBJS)
diff --git a/libc/misc/time/strftime.c b/libc/misc/time/strftime.c
new file mode 100644
index 000000000..8529446eb
--- /dev/null
+++ b/libc/misc/time/strftime.c
@@ -0,0 +1,398 @@
+/* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+
+The GNU C Library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public License as
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+The GNU C Library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with the GNU C Library; see the file COPYING.LIB. If
+not, write to the Free Software Foundation, Inc., 675 Mass Ave,
+Cambridge, MA 02139, USA. */
+
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <sys/types.h> /* Some systems define `time_t' here. */
+#include <sys/time.h>
+#include <time.h>
+#include <ctype.h>
+#include <limits.h>
+
+static unsigned int week (const struct tm *const, int, int);
+
+#define add(n, f) \
+ do \
+ { \
+ i += (n); \
+ if (i >= maxsize) \
+ return 0; \
+ else \
+ if (p) \
+ { \
+ f; \
+ p += (n); \
+ } \
+ } while (0)
+#define cpy(n, s) add((n), memcpy((void *) p, (void *) (s), (n)))
+
+#ifdef _LIBC
+#define fmt(n, args) add((n), if (sprintf args != (n)) return 0)
+#else
+#define fmt(n, args) add((n), sprintf args; if (strlen (p) != (n)) return 0)
+#endif
+
+
+
+/* Return the week in the year specified by TP,
+ with weeks starting on STARTING_DAY. */
+static unsigned int week(const struct tm *const tp , int starting_day , int max_preceding )
+{
+ int wday, dl, base;
+
+ wday = tp->tm_wday - starting_day;
+ if (wday < 0)
+ wday += 7;
+
+ /* Set DL to the day in the year of the first day of the week
+ containing the day specified in TP. */
+ dl = tp->tm_yday - wday;
+
+ /* For the computation following ISO 8601:1988 we set the number of
+ the week containing January 1st to 1 if this week has more than
+ MAX_PRECEDING days in the new year. For ISO 8601 this number is
+ 3, for the other representation it is 7 (i.e., not to be
+ fulfilled). */
+ base = ((dl + 7) % 7) > max_preceding ? 1 : 0;
+
+ /* If DL is negative we compute the result as 0 unless we have to
+ compute it according ISO 8601. In this case we have to return 53
+ or 1 if the week containing January 1st has less than 4 days in
+ the new year or not. If DL is not negative we calculate the
+ number of complete weeks for our week (DL / 7) plus 1 (because
+ only for DL < 0 we are in week 0/53 and plus the number of the
+ first week computed in the last step. */
+ return dl < 0 ? (dl < -max_preceding ? 53 : base)
+ : base + 1 + dl / 7;
+}
+
+#ifndef _NL_CURRENT
+static char const weekday_name[][10] =
+ {
+ "Sunday", "Monday", "Tuesday", "Wednesday",
+ "Thursday", "Friday", "Saturday"
+ };
+static char const month_name[][10] =
+ {
+ "January", "February", "March", "April", "May", "June",
+ "July", "August", "September", "October", "November", "December"
+ };
+#endif
+
+/* Write information from TP into S according to the format
+ string FORMAT, writing no more that MAXSIZE characters
+ (including the terminating '\0') and returning number of
+ characters written. If S is NULL, nothing will be written
+ anywhere, so to determine how many characters would be
+ written, use NULL for S and (size_t) UINT_MAX for MAXSIZE. */
+size_t strftime( char *s , size_t maxsize , const char *format , register const struct tm *tp)
+{
+ int hour12 = tp->tm_hour;
+#ifdef _NL_CURRENT
+ const char *const a_wkday = _NL_CURRENT (LC_TIME, ABDAY_1 + tp->tm_wday);
+ const char *const f_wkday = _NL_CURRENT (LC_TIME, DAY_1 + tp->tm_wday);
+ const char *const a_month = _NL_CURRENT (LC_TIME, ABMON_1 + tp->tm_mon);
+ const char *const f_month = _NL_CURRENT (LC_TIME, MON_1 + tp->tm_mon);
+ const char *const ampm = _NL_CURRENT (LC_TIME,
+ hour12 > 11 ? PM_STR : AM_STR);
+ size_t aw_len = strlen(a_wkday);
+ size_t am_len = strlen(a_month);
+ size_t ap_len = strlen (ampm);
+#else
+ const char *const f_wkday = weekday_name[tp->tm_wday];
+ const char *const f_month = month_name[tp->tm_mon];
+ const char *const a_wkday = f_wkday;
+ const char *const a_month = f_month;
+ const char *const ampm = "AMPM" + 2 * (hour12 > 11);
+ size_t aw_len = 3;
+ size_t am_len = 3;
+ size_t ap_len = 2;
+#endif
+ size_t wkday_len = strlen(f_wkday);
+ size_t month_len = strlen(f_month);
+ const unsigned int y_week0 = week (tp, 0, 7);
+ const unsigned int y_week1 = week (tp, 1, 7);
+ const unsigned int y_week2 = week (tp, 1, 3);
+ const char *zone;
+ size_t zonelen;
+ register size_t i = 0;
+ register char *p = s;
+ register const char *f;
+ char number_fmt[5];
+
+ /* Initialize the buffer we will use for the sprintf format for numbers. */
+ number_fmt[0] = '%';
+
+ zone = 0;
+#if HAVE_TM_ZONE
+ zone = (const char *) tp->tm_zone;
+#endif
+#if HAVE_TZNAME
+ if (!(zone && *zone) && tp->tm_isdst >= 0)
+ zone = tzname[tp->tm_isdst];
+#endif
+ if (!(zone && *zone))
+ zone = "???";
+
+ zonelen = strlen (zone);
+
+ if (hour12 > 12)
+ hour12 -= 12;
+ else
+ if (hour12 == 0) hour12 = 12;
+
+ for (f = format; *f != '\0'; ++f)
+ {
+ enum { pad_zero, pad_space, pad_none } pad; /* Padding for number. */
+ unsigned int maxdigits; /* Max digits for numeric format. */
+ unsigned int number_value; /* Numeric value to be printed. */
+ const char *subfmt;
+
+#if HAVE_MBLEN
+ if (!isascii(*f))
+ {
+ /* Non-ASCII, may be a multibyte. */
+ int len = mblen(f, strlen(f));
+ if (len > 0)
+ {
+ cpy(len, f);
+ continue;
+ }
+ }
+#endif
+
+ if (*f != '%')
+ {
+ add(1, *p = *f);
+ continue;
+ }
+
+ /* Check for flags that can modify a number format. */
+ ++f;
+ switch (*f)
+ {
+ case '_':
+ pad = pad_space;
+ ++f;
+ break;
+ case '-':
+ pad = pad_none;
+ ++f;
+ break;
+ default:
+ pad = pad_zero;
+ break;
+ }
+
+ /* Now do the specified format. */
+ switch (*f)
+ {
+ case '\0':
+ case '%':
+ add(1, *p = *f);
+ break;
+
+ case 'a':
+ cpy(aw_len, a_wkday);
+ break;
+
+ case 'A':
+ cpy(wkday_len, f_wkday);
+ break;
+
+ case 'b':
+ case 'h': /* GNU extension. */
+ cpy(am_len, a_month);
+ break;
+
+ case 'B':
+ cpy(month_len, f_month);
+ break;
+
+ case 'c':
+#ifdef _NL_CURRENT
+ subfmt = _NL_CURRENT (LC_TIME, D_T_FMT);
+#else
+ subfmt = "%a %b %d %H:%M:%S %Z %Y";
+#endif
+ subformat:
+ {
+ size_t len = strftime (p, maxsize - i, subfmt, tp);
+ if (len == 0 && *subfmt)
+ return 0;
+ add(len, );
+ }
+ break;
+
+#define DO_NUMBER(digits, value) \
+ maxdigits = digits; number_value = value; goto do_number
+#define DO_NUMBER_NOPAD(digits, value) \
+ maxdigits = digits; number_value = value; goto do_number_nopad
+
+ case 'C':
+ DO_NUMBER (2, (1900 + tp->tm_year) / 100);
+
+ case 'x':
+#ifdef _NL_CURRENT
+ subfmt = _NL_CURRENT (LC_TIME, D_FMT);
+ goto subformat;
+#endif
+ /* Fall through. */
+ case 'D': /* GNU extension. */
+ subfmt = "%m/%d/%y";
+ goto subformat;
+
+ case 'd':
+ DO_NUMBER (2, tp->tm_mday);
+
+ case 'e': /* GNU extension: %d, but blank-padded. */
+#if 0
+ DO_NUMBER_NOPAD (2, tp->tm_mday);
+#else
+ DO_NUMBER (2, tp->tm_mday);
+#endif
+
+ /* All numeric formats set MAXDIGITS and NUMBER_VALUE and then
+ jump to one of these two labels. */
+
+ do_number_nopad:
+ /* Force `-' flag. */
+ pad = pad_none;
+
+ do_number:
+ {
+ /* Format the number according to the PAD flag. */
+
+ register char *nf = &number_fmt[1];
+ int printed;
+
+ switch (pad)
+ {
+ case pad_zero:
+ *nf++ = '0';
+ case pad_space:
+ *nf++ = '0' + maxdigits;
+ case pad_none:
+ *nf++ = 'u';
+ *nf = '\0';
+ }
+
+#ifdef _LIBC
+ if (i + maxdigits >= maxsize)
+ return 0;
+ printed = sprintf (p, number_fmt, number_value);
+ i += printed;
+ p += printed;
+#else
+ add (maxdigits, sprintf (p, number_fmt, number_value);
+ printed = strlen (p));
+#endif
+
+ break;
+ }
+
+
+ case 'H':
+ DO_NUMBER (2, tp->tm_hour);
+
+ case 'I':
+ DO_NUMBER (2, hour12);
+
+ case 'k': /* GNU extension. */
+ DO_NUMBER_NOPAD (2, tp->tm_hour);
+
+ case 'l': /* GNU extension. */
+ DO_NUMBER_NOPAD (2, hour12);
+
+ case 'j':
+ DO_NUMBER (3, 1 + tp->tm_yday);
+
+ case 'M':
+ DO_NUMBER (2, tp->tm_min);
+
+ case 'm':
+ DO_NUMBER (2, tp->tm_mon + 1);
+
+ case 'n': /* GNU extension. */
+ add (1, *p = '\n');
+ break;
+
+ case 'p':
+ cpy(ap_len, ampm);
+ break;
+
+ case 'R': /* GNU extension. */
+ subfmt = "%H:%M";
+ goto subformat;
+
+ case 'r': /* GNU extension. */
+ subfmt = "%I:%M:%S %p";
+ goto subformat;
+
+ case 'S':
+ DO_NUMBER (2, tp->tm_sec);
+
+ case 'X':
+#ifdef _NL_CURRENT
+ subfmt = _NL_CURRENT (LC_TIME, T_FMT);
+ goto subformat;
+#endif
+ /* Fall through. */
+ case 'T': /* GNU extenstion. */
+ subfmt = "%H:%M:%S";
+ goto subformat;
+
+ case 't': /* GNU extenstion. */
+ add (1, *p = '\t');
+ break;
+
+ case 'U':
+ DO_NUMBER (2, y_week0);
+
+ case 'V':
+ DO_NUMBER (2, y_week2);
+
+ case 'W':
+ DO_NUMBER (2, y_week1);
+
+ case 'w':
+ DO_NUMBER (1, tp->tm_wday);
+
+ case 'Y':
+ DO_NUMBER (4, 1900 + tp->tm_year);
+
+ case 'y':
+ DO_NUMBER (2, tp->tm_year % 100);
+
+ case 'Z':
+ cpy(zonelen, zone);
+ break;
+
+ default:
+ /* Bad format. */
+ break;
+ }
+ }
+
+ if (p)
+ *p = '\0';
+ return i;
+}
diff --git a/libc/stdlib/Makefile b/libc/stdlib/Makefile
index 285080523..1a8650ad8 100644
--- a/libc/stdlib/Makefile
+++ b/libc/stdlib/Makefile
@@ -67,7 +67,7 @@ $(patsubst %, _dir_%, $(DIRS)) : dummy
$(patsubst %, _dirclean_%, $(DIRS)) : dummy
$(MAKE) -C $(patsubst _dirclean_%, %, $@) clean
-clean:
+clean: subdirs_clean
rm -f *.[oa] *~ core
.PHONY: dummy
diff --git a/libc/sysdeps/linux/common/syscalls.c b/libc/sysdeps/linux/common/syscalls.c
index ea8ef0186..8943e76e8 100644
--- a/libc/sysdeps/linux/common/syscalls.c
+++ b/libc/sysdeps/linux/common/syscalls.c
@@ -647,10 +647,16 @@ _syscall2(int,socketcall,int,call,unsigned long *,args);
#endif
//#define __NR_syslog 103
-#ifdef L_syslog
+#ifdef L__syslog
#include <unistd.h>
#define __NR__syslog __NR_syslog
_syscall3(int,_syslog,int, type, char *, buf, int, len);
+
+int klogctl (int type, char * buf, int len)
+{
+ return(_syslog(type, buf, len));
+}
+
#endif
//#define __NR_setitimer 104
diff --git a/libc/unistd/.indent.pro b/libc/unistd/.indent.pro
new file mode 100644
index 000000000..492ecf1c7
--- /dev/null
+++ b/libc/unistd/.indent.pro
@@ -0,0 +1,33 @@
+--blank-lines-after-declarations
+--blank-lines-after-procedures
+--break-before-boolean-operator
+--no-blank-lines-after-commas
+--braces-on-if-line
+--braces-on-struct-decl-line
+--comment-indentation25
+--declaration-comment-column25
+--no-comment-delimiters-on-blank-lines
+--cuddle-else
+--continuation-indentation4
+--case-indentation0
+--else-endif-column33
+--space-after-cast
+--line-comments-indentation0
+--declaration-indentation1
+--dont-format-first-column-comments
+--dont-format-comments
+--honour-newlines
+--indent-level4
+/* changed from 0 to 4 */
+--parameter-indentation4
+--line-length78 /* changed from 75 */
+--continue-at-parentheses
+--no-space-after-function-call-names
+--dont-break-procedure-type
+--dont-star-comments
+--leave-optional-blank-lines
+--dont-space-special-semicolon
+--tab-size4
+/* additions by Mark */
+--case-brace-indentation0
+--leave-preprocessor-space
diff --git a/test/Makefile b/test/Makefile
index ebc60523d..6f6d06fd7 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -27,6 +27,7 @@ tags:
ctags -R
clean: subdirs_clean
+ rm -f *.[oa] *~ core
subdirs: $(patsubst %, _dir_%, $(DIRS))
subdirs_clean: $(patsubst %, _dirclean_%, $(DIRS))
diff --git a/test/silly/.cvsignore b/test/silly/.cvsignore
index c6e0c6f72..e4f16bb13 100644
--- a/test/silly/.cvsignore
+++ b/test/silly/.cvsignore
@@ -2,3 +2,5 @@ hello
hello.o
hello_glibc
hello_glibc.o
+tiny
+tiny.o
diff --git a/test/silly/tiny.c b/test/silly/tiny.c
new file mode 100644
index 000000000..cbf8b1643
--- /dev/null
+++ b/test/silly/tiny.c
@@ -0,0 +1,8 @@
+#include <stdlib.h>
+#include <unistd.h>
+
+int main(void)
+{
+ write(1,"hello world\n",12);
+ exit(42);
+}