diff options
author | kstailey <kstailey@cvs.openbsd.org> | 1997-07-23 21:04:09 +0000 |
---|---|---|
committer | kstailey <kstailey@cvs.openbsd.org> | 1997-07-23 21:04:09 +0000 |
commit | ec46112e5f33c175b7e899a1c46027347c3aa97b (patch) | |
tree | 77a4190a1c8b7ba00493ab57794cd387d997cc0e | |
parent | ca8b6682a9a4609bf4be0b3ee7866352ae39eb15 (diff) |
tabify
-rw-r--r-- | lib/libc/gen/Makefile.inc | 4 | ||||
-rw-r--r-- | lib/libc/gen/disklabel.c | 4 | ||||
-rw-r--r-- | lib/libc/gen/getcap.c | 24 | ||||
-rw-r--r-- | lib/libc/gen/getnetgrent.c | 14 | ||||
-rw-r--r-- | lib/libc/gen/getpwent.c | 4 | ||||
-rw-r--r-- | lib/libc/gen/nlist.c | 112 | ||||
-rw-r--r-- | lib/libc/gen/setmode.c | 8 | ||||
-rw-r--r-- | lib/libc/gen/signal.3 | 4 | ||||
-rw-r--r-- | lib/libc/gen/utime.3 | 6 |
9 files changed, 90 insertions, 90 deletions
diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index 93c71eccb9b..2bb130fe089 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.9 1997/02/03 00:10:08 millert Exp $ +# $OpenBSD: Makefile.inc,v 1.10 1997/07/23 21:04:03 kstailey Exp $ # gen sources .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/gen ${.CURDIR}/gen @@ -61,7 +61,7 @@ MLINKS+=directory.3 closedir.3 directory.3 dirfd.3 directory.3 opendir.3 \ directory.3 readdir.3 directory.3 rewinddir.3 directory.3 seekdir.3 \ directory.3 telldir.3 MLINKS+=err.3 verr.3 err.3 errx.3 err.3 verrx.3 err.3 warn.3 err.3 vwarn.3 \ - err.3 warnx.3 err.3 vwarnx.3 + err.3 warnx.3 err.3 vwarnx.3 MLINKS+=exec.3 execl.3 exec.3 execle.3 exec.3 execlp.3 exec.3 exect.3 \ exec.3 execv.3 exec.3 execvp.3 MLINKS+=fts.3 fts_open.3 fts.3 fts_read.3 fts.3 fts_children.3 \ diff --git a/lib/libc/gen/disklabel.c b/lib/libc/gen/disklabel.c index 8b81c83f10a..56d6f081820 100644 --- a/lib/libc/gen/disklabel.c +++ b/lib/libc/gen/disklabel.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: disklabel.c,v 1.3 1996/09/15 09:30:58 tholo Exp $"; +static char rcsid[] = "$OpenBSD: disklabel.c,v 1.4 1997/07/23 21:04:04 kstailey Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> @@ -91,7 +91,7 @@ getdiskbyname(name) dp->d_flags |= D_BADSECT; #define getnumdflt(field, dname, dflt) \ - { long f; (field) = (cgetnum(buf, dname, &f) == -1) ? (dflt) : f; } + { long f; (field) = (cgetnum(buf, dname, &f) == -1) ? (dflt) : f; } #define getnum(field, dname) \ { long f; cgetnum(buf, dname, &f); field = f; } diff --git a/lib/libc/gen/getcap.c b/lib/libc/gen/getcap.c index 607b7375792..e3833211cbe 100644 --- a/lib/libc/gen/getcap.c +++ b/lib/libc/gen/getcap.c @@ -35,7 +35,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: getcap.c,v 1.5 1997/06/10 21:44:15 millert Exp $"; +static char rcsid[] = "$OpenBSD: getcap.c,v 1.6 1997/07/23 21:04:04 kstailey Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -80,18 +80,18 @@ cgetset(ent) if (ent == NULL) { if (toprec) free(toprec); - toprec = NULL; - topreclen = 0; - return (0); - } - topreclen = strlen(ent); - if ((toprec = malloc (topreclen + 1)) == NULL) { + toprec = NULL; + topreclen = 0; + return (0); + } + topreclen = strlen(ent); + if ((toprec = malloc (topreclen + 1)) == NULL) { errno = ENOMEM; - return (-1); + return (-1); } gottoprec = 0; - (void)strcpy(toprec, ent); - return (0); + (void)strcpy(toprec, ent); + return (0); } /* @@ -207,7 +207,7 @@ getent(cap, len, db_array, fd, name, depth, nfield) /* * Check if we have a top record from cgetset(). - */ + */ if (depth == 0 && toprec != NULL && cgetmatch(toprec, name) == 0) { if ((record = malloc (topreclen + BFRAG)) == NULL) { errno = ENOMEM; @@ -643,7 +643,7 @@ cgetclose() */ int cgetnext(bp, db_array) - register char **bp; + register char **bp; char **db_array; { size_t len; diff --git a/lib/libc/gen/getnetgrent.c b/lib/libc/gen/getnetgrent.c index 91675c0e4e5..153f5521c0d 100644 --- a/lib/libc/gen/getnetgrent.c +++ b/lib/libc/gen/getnetgrent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getnetgrent.c,v 1.5 1997/02/03 00:10:08 millert Exp $ */ +/* $OpenBSD: getnetgrent.c,v 1.6 1997/07/23 21:04:05 kstailey Exp $ */ /* * Copyright (c) 1994 Christos Zoulas @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: getnetgrent.c,v 1.5 1997/02/03 00:10:08 millert Exp $"; +static char *rcsid = "$OpenBSD: getnetgrent.c,v 1.6 1997/07/23 21:04:05 kstailey Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -77,7 +77,7 @@ static int in_find __P((char *, struct stringlist *, static char *in_lookup1 __P((const char *, const char *, const char *, int)); static int in_lookup __P((const char *, const char *, - const char *, const char *, int)); + const char *, const char *, int)); /* * _ng_sl_init(): Initialize a string list @@ -253,8 +253,8 @@ lookup(ypdom, name, line, bywhat) int bywhat; { #ifdef YP - int i; - char *map = NULL; + int i; + char *map = NULL; #endif if (_ng_db) { @@ -344,8 +344,8 @@ _ng_parse(p, name, ng) } return _NG_GROUP; } else { - char *np; - int i; + char *np; + int i; for (np = *p; **p && !_NG_ISSPACE(**p); (*p)++) continue; diff --git a/lib/libc/gen/getpwent.c b/lib/libc/gen/getpwent.c index 12aeeb618e0..854e02acea5 100644 --- a/lib/libc/gen/getpwent.c +++ b/lib/libc/gen/getpwent.c @@ -33,7 +33,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: getpwent.c,v 1.10 1997/04/18 18:55:16 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: getpwent.c,v 1.11 1997/07/23 21:04:06 kstailey Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/param.h> @@ -797,7 +797,7 @@ pwuid_netgrp: free(__ypcurrent); __ypcurrent = NULL; /* - * just because this + * just because this * user is bad, doesn't * mean they all are. */ diff --git a/lib/libc/gen/nlist.c b/lib/libc/gen/nlist.c index 0d2e28dc5f5..90bd795ff34 100644 --- a/lib/libc/gen/nlist.c +++ b/lib/libc/gen/nlist.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: nlist.c,v 1.20 1997/07/01 05:59:44 millert Exp $"; +static char rcsid[] = "$OpenBSD: nlist.c,v 1.21 1997/07/23 21:04:06 kstailey Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -294,49 +294,49 @@ __elf_fdnlist(fd, list) Elf32_Sym *s; Elf32_Ehdr ehdr; Elf32_Shdr *shdr = NULL; - Elf32_Word shdr_size; + Elf32_Word shdr_size; struct stat st; - /* Make sure obj is OK */ + /* Make sure obj is OK */ if (lseek(fd, (off_t)0, SEEK_SET) == -1 || read(fd, &ehdr, sizeof(Elf32_Ehdr)) != sizeof(Elf32_Ehdr) || !__elf_is_okay__(&ehdr) || fstat(fd, &st) < 0) return (-1); - /* calculate section header table size */ - shdr_size = ehdr.e_shentsize * ehdr.e_shnum; + /* calculate section header table size */ + shdr_size = ehdr.e_shentsize * ehdr.e_shnum; - /* Make sure it's not too big to mmap */ + /* Make sure it's not too big to mmap */ if (shdr_size > SIZE_T_MAX) { errno = EFBIG; return (-1); } - /* mmap section header table */ + /* mmap section header table */ shdr = (Elf32_Shdr *)mmap(NULL, (size_t)shdr_size, - PROT_READ, 0, fd, (off_t) ehdr.e_shoff); + PROT_READ, 0, fd, (off_t) ehdr.e_shoff); if (shdr == (Elf32_Shdr *)-1) return (-1); - /* - * Find the symbol table entry and it's corresponding - * string table entry. Version 1.1 of the ABI states - * that there is only one symbol table but that this - * could change in the future. - */ - for (i = 0; i < ehdr.e_shnum; i++) { - if (shdr[i].sh_type == SHT_SYMTAB) { - symoff = shdr[i].sh_offset; - symsize = shdr[i].sh_size; - symstroff = shdr[shdr[i].sh_link].sh_offset; - symstrsize = shdr[shdr[i].sh_link].sh_size; - break; - } - } - - /* Flush the section header table */ - munmap((caddr_t)shdr, shdr_size); + /* + * Find the symbol table entry and it's corresponding + * string table entry. Version 1.1 of the ABI states + * that there is only one symbol table but that this + * could change in the future. + */ + for (i = 0; i < ehdr.e_shnum; i++) { + if (shdr[i].sh_type == SHT_SYMTAB) { + symoff = shdr[i].sh_offset; + symsize = shdr[i].sh_size; + symstroff = shdr[shdr[i].sh_link].sh_offset; + symstrsize = shdr[shdr[i].sh_link].sh_size; + break; + } + } + + /* Flush the section header table */ + munmap((caddr_t)shdr, shdr_size); /* Check for files too large to mmap. */ /* XXX is this really possible? */ @@ -372,16 +372,16 @@ __elf_fdnlist(fd, list) ++nent; } - /* Don't process any further if object is stripped. */ - /* ELFism - dunno if stripped by looking at header */ - if (symoff == 0) - goto done; - + /* Don't process any further if object is stripped. */ + /* ELFism - dunno if stripped by looking at header */ + if (symoff == 0) + goto done; + if (lseek(fd, (off_t) symoff, SEEK_SET) == -1) { - nent = -1; - goto done; - } - + nent = -1; + goto done; + } + while (symsize > 0) { cc = MIN(symsize, sizeof(sbuf)); if (read(fd, sbuf, cc) != cc) @@ -393,36 +393,36 @@ __elf_fdnlist(fd, list) if (soff == 0) continue; for (p = list; !ISLAST(p); p++) { - /* - * XXX - ABI crap, they - * really fucked this up - * for MIPS and PowerPC - */ + /* + * XXX - ABI crap, they + * really fucked this up + * for MIPS and PowerPC + */ if (!strcmp(&strtab[soff], ((ehdr.e_machine == EM_MIPS) || - (ehdr.e_machine == EM_PPC)) ? + (ehdr.e_machine == EM_PPC)) ? p->n_un.n_name+1 : p->n_un.n_name)) { p->n_value = s->st_value; - /* XXX - type conversion */ - /* is pretty rude. */ + /* XXX - type conversion */ + /* is pretty rude. */ switch(ELF32_ST_TYPE(s->st_info)) { - case STT_NOTYPE: - p->n_type = N_UNDF; - break; - case STT_OBJECT: - p->n_type = N_DATA; - break; - case STT_FUNC: - p->n_type = N_TEXT; - break; - case STT_FILE: - p->n_type = N_FN; - break; + case STT_NOTYPE: + p->n_type = N_UNDF; + break; + case STT_OBJECT: + p->n_type = N_DATA; + break; + case STT_FUNC: + p->n_type = N_TEXT; + break; + case STT_FILE: + p->n_type = N_FN; + break; } if (ELF32_ST_BIND(s->st_info) == - STB_LOCAL) + STB_LOCAL) p->n_type = N_EXT; p->n_desc = 0; p->n_other = 0; diff --git a/lib/libc/gen/setmode.c b/lib/libc/gen/setmode.c index bbf50532836..f5f41277202 100644 --- a/lib/libc/gen/setmode.c +++ b/lib/libc/gen/setmode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: setmode.c,v 1.5 1997/03/07 02:15:18 millert Exp $ */ +/* $OpenBSD: setmode.c,v 1.6 1997/07/23 21:04:07 kstailey Exp $ */ /* $NetBSD: setmode.c,v 1.15 1997/02/07 22:21:06 christos Exp $ */ /* @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)setmode.c 8.2 (Berkeley) 3/25/94"; #else -static char rcsid[] = "$OpenBSD: setmode.c,v 1.5 1997/03/07 02:15:18 millert Exp $"; +static char rcsid[] = "$OpenBSD: setmode.c,v 1.6 1997/07/23 21:04:07 kstailey Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -195,10 +195,10 @@ setmode(p) * as best we can. */ sigfillset(&sigset); - (void)sigprocmask(SIG_BLOCK, &sigset, &sigoset); + (void)sigprocmask(SIG_BLOCK, &sigset, &sigoset); (void)umask(mask = umask(0)); mask = ~mask; - (void)sigprocmask(SIG_SETMASK, &sigoset, NULL); + (void)sigprocmask(SIG_SETMASK, &sigoset, NULL); setlen = SET_LEN + 2; diff --git a/lib/libc/gen/signal.3 b/lib/libc/gen/signal.3 index 390c92e2bb4..8da05c559ef 100644 --- a/lib/libc/gen/signal.3 +++ b/lib/libc/gen/signal.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: signal.3,v 1.4 1996/12/13 21:24:12 michaels Exp $ +.\" $OpenBSD: signal.3,v 1.5 1997/07/23 21:04:07 kstailey Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -83,7 +83,7 @@ an interrupt. These signals are defined in the file .Aq Pa signal.h : .Bl -column SIGVTALARMXX "create core imagexxx" -.It Sy " Name " " Default Action " " Description" +.It Sy " Name " " Default Action " " Description" .It Dv SIGHUP No " terminate process" " terminal line hangup" .It Dv SIGINT No " terminate process" " interrupt program" .It Dv SIGQUIT No " create core image" " quit program" diff --git a/lib/libc/gen/utime.3 b/lib/libc/gen/utime.3 index 9f72ecbb554..6c3284fb563 100644 --- a/lib/libc/gen/utime.3 +++ b/lib/libc/gen/utime.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: utime.3,v 1.2 1996/08/19 08:27:22 tholo Exp $ +.\" $OpenBSD: utime.3,v 1.3 1997/07/23 21:04:08 kstailey Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -68,8 +68,8 @@ is assumed to be a pointer to a utimbuf structure, as defined in .Aq Pa utime.h : .Bd -literal -offset indent struct utimbuf { - time_t actime; /* Access time */ - time_t modtime; /* Modification time */ + time_t actime; /* Access time */ + time_t modtime; /* Modification time */ } ; .Ed .Pp |