diff options
Diffstat (limited to 'libc/misc')
| -rw-r--r-- | libc/misc/Makefile | 8 | ||||
| -rw-r--r-- | libc/misc/ctype/ctype.c | 1 | ||||
| -rw-r--r-- | libc/misc/lock/.indent.pro | 33 | ||||
| -rw-r--r-- | libc/misc/lock/Makefile | 44 | ||||
| -rw-r--r-- | libc/misc/lock/flock.c | 54 | ||||
| -rw-r--r-- | libc/misc/time/Makefile | 2 | ||||
| -rw-r--r-- | libc/misc/time/clock.c | 45 | ||||
| -rw-r--r-- | libc/misc/time/difftime.c | 67 |
8 files changed, 249 insertions, 5 deletions
diff --git a/libc/misc/Makefile b/libc/misc/Makefile index 7ff8da188..dcd40319c 100644 --- a/libc/misc/Makefile +++ b/libc/misc/Makefile @@ -20,12 +20,12 @@ # other sundry sources. Files within this library are copyright by their # respective copyright holders. +TOPDIR=../ +include $(TOPDIR)Rules.mak +LIBC=$(TOPDIR)libc.a -DIRS = assert crypt fnmatch glob internals lsearch mntent syslog regex shm time -ifeq ($(USE_CTYPE_C_FUNCTIONS),true) - DIRS+=ctype -endif +DIRS = assert crypt ctype fnmatch glob internals lsearch mntent syslog regex shm time all: libc.a diff --git a/libc/misc/ctype/ctype.c b/libc/misc/ctype/ctype.c index 78e1f8891..1063f443d 100644 --- a/libc/misc/ctype/ctype.c +++ b/libc/misc/ctype/ctype.c @@ -6,6 +6,7 @@ * under the GNU Library General Public License. */ +#define USE_CTYPE_C_FUNCTIONS #include <ctype.h> int diff --git a/libc/misc/lock/.indent.pro b/libc/misc/lock/.indent.pro new file mode 100644 index 000000000..492ecf1c7 --- /dev/null +++ b/libc/misc/lock/.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/libc/misc/lock/Makefile b/libc/misc/lock/Makefile new file mode 100644 index 000000000..e319c11df --- /dev/null +++ b/libc/misc/lock/Makefile @@ -0,0 +1,44 @@ +# Makefile for uCLibc +# +# Copyright (C) 2000 by Lineo, inc. +# +# This program 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. +# +# This program 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 General Public License for more +# details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, write to the Free Software Foundation, Inc., 59 Temple +# Place, Suite 330, Boston, MA 02111-1307 USA +# +# Derived in part from the Linux-8086 C library, the GNU C Library, and several +# other sundry sources. Files within this library are copyright by their +# respective copyright holders. + +TOPDIR=../../ +include $(TOPDIR)Rules.mak +LIBC=$(TOPDIR)libc.a + +CSRC=flock.c +COBJS=$(patsubst %.c,%.o, $(CSRC)) +OBJS=$(COBJS) + +all: $(OBJS) $(LIBC) + +$(LIBC): ar-target + +ar-target: $(OBJS) + $(AR) $(ARFLAGS) $(LIBC) $(OBJS) + +$(COBJS): + $(CC) $(CFLAGS) $< -c $*.c -o $*.o + $(STRIPTOOL) -x -R .note -R .comment $*.o + +clean: + rm -f *.[oa] *~ core + diff --git a/libc/misc/lock/flock.c b/libc/misc/lock/flock.c new file mode 100644 index 000000000..3c1264655 --- /dev/null +++ b/libc/misc/lock/flock.c @@ -0,0 +1,54 @@ +/* Copyright (C) 1992, 1995, 1996, 1997 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., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +/* This file implements the `flock' function in terms of the POSIX.1 `fcntl' + locking mechanism. In 4BSD, these are two incompatible locking mechanisms, + perhaps with different semantics? */ + +#include <errno.h> +#include <unistd.h> +#include <fcntl.h> +#include <sys/file.h> + +/* Apply or remove an advisory lock, according to OPERATION, + on the file FD refers to. */ +int flock( int fd, int operation) +{ + struct flock lbuf; + + switch (operation & ~LOCK_NB) { + case LOCK_SH: + lbuf.l_type = F_RDLCK; + break; + case LOCK_EX: + lbuf.l_type = F_WRLCK; + break; + case LOCK_UN: + lbuf.l_type = F_UNLCK; + break; + default: + errno = EINVAL; + return -1; + } + + lbuf.l_whence = SEEK_SET; + lbuf.l_start = lbuf.l_len = 0L; /* Lock the whole file. */ + + return fcntl(fd, (operation & LOCK_NB) ? F_SETLK : F_SETLKW, &lbuf); +} + diff --git a/libc/misc/time/Makefile b/libc/misc/time/Makefile index 0d24f43e4..70ee192c4 100644 --- a/libc/misc/time/Makefile +++ b/libc/misc/time/Makefile @@ -26,7 +26,7 @@ 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 \ - strftime.c + strftime.c clock.c times.c difftime.c COBJS=$(patsubst %.c,%.o, $(CSRC)) OBJS=$(COBJS) diff --git a/libc/misc/time/clock.c b/libc/misc/time/clock.c new file mode 100644 index 000000000..4d1a17869 --- /dev/null +++ b/libc/misc/time/clock.c @@ -0,0 +1,45 @@ +/* Copyright (C) 1991, 1992, 1996, 1999 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., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <sys/times.h> +#include <time.h> +#include <unistd.h> + +/* Return the time used by the program so far (user time + system time). */ +clock_t +clock (void) +{ + struct tms buf; + long clk_tck = sysconf (_SC_CLK_TCK); + + /* We don't check for errors here. The only error the kernel + returns is EFAULT if the value cannot be written to the struct we + pass a pointer to. Otherwise the kernel returns an `unsigned + long' value which is the number of jiffies since system start. + But this number can be negative (when read as `long') when the + system is up for some time. Ignoring errors should therefore + have no negative impacts but solve the problem. */ + times (&buf); + + return + (clk_tck <= CLOCKS_PER_SEC) + ? ((unsigned long) buf.tms_utime + buf.tms_stime) * (CLOCKS_PER_SEC + / clk_tck) + : ((unsigned long) buf.tms_utime + buf.tms_stime) / (clk_tck + / CLOCKS_PER_SEC); +} diff --git a/libc/misc/time/difftime.c b/libc/misc/time/difftime.c new file mode 100644 index 000000000..6a9b708ea --- /dev/null +++ b/libc/misc/time/difftime.c @@ -0,0 +1,67 @@ +/* Copyright (C) 1991, 1994, 1996 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., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <time.h> +#include <limits.h> +#include <sys/types.h> + + +/* Return the difference between TIME1 and TIME0. */ +double +difftime (time1, time0) + time_t time1; + time_t time0; +{ + /* Algorithm courtesy Paul Eggert (eggert@twinsun.com). */ + + time_t delta, hibit; + + if (sizeof (time_t) < sizeof (double)) + return (double) time1 - (double) time0; + if (sizeof (time_t) < sizeof (long double)) + return (long double) time1 - (long double) time0; + + if (time1 < time0) + return - difftime (time0, time1); + + /* As much as possible, avoid loss of precision by computing the + difference before converting to double. */ + delta = time1 - time0; + if (delta >= 0) + return delta; + + /* Repair delta overflow. */ + hibit = (~ (time_t) 0) << ((sizeof (time_t) * CHAR_BIT) - 1); + + /* The following expression rounds twice, which means the result may not + be the closest to the true answer. For example, suppose time_t is + 64-bit signed int, long_double is IEEE 754 double with default + rounding, time1 = 9223372036854775807 and time0 = -1536. Then the + true difference is 9223372036854777343, which rounds to + 9223372036854777856 with a total error of 513. But delta overflows to + -9223372036854774273, which rounds to -9223372036854774784, and + correcting this by subtracting 2 * (long_double) hibit (i.e. by adding + 2**64 = 18446744073709551616) yields 9223372036854776832, which rounds + to 9223372036854775808 with a total error of 1535 instead. This + problem occurs only with very large differences. It's too painful to + fix this portably. We are not alone in this problem; many C compilers + round twice when converting large unsigned types to small floating + types, so if time_t is unsigned the "return delta" above has the same + double-rounding problem. */ + return delta - 2 * (long double) hibit; +} |