diff options
| -rw-r--r-- | bin/df/df.c | 6 | ||||
| -rw-r--r-- | bin/ls/ls.h | 4 | ||||
| -rw-r--r-- | bin/pax/getoldopt.c | 8 | ||||
| -rw-r--r-- | bin/ps/fmt.c | 13 | ||||
| -rw-r--r-- | bin/stty/modes.c | 5 |
5 files changed, 28 insertions, 8 deletions
diff --git a/bin/df/df.c b/bin/df/df.c index 1927e7c2163..339f7ed80d9 100644 --- a/bin/df/df.c +++ b/bin/df/df.c @@ -1,4 +1,4 @@ -/* $OpenBSD: df.c,v 1.35 2003/06/02 23:32:07 millert Exp $ */ +/* $OpenBSD: df.c,v 1.36 2003/07/02 21:19:33 deraadt Exp $ */ /* $NetBSD: df.c,v 1.21.2.1 1995/11/01 00:06:11 jtc Exp $ */ /* @@ -45,7 +45,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)df.c 8.7 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: df.c,v 1.35 2003/06/02 23:32:07 millert Exp $"; +static char rcsid[] = "$OpenBSD: df.c,v 1.36 2003/07/02 21:19:33 deraadt Exp $"; #endif #endif /* not lint */ @@ -74,6 +74,8 @@ void prtstat(struct statfs *, int, int, int); void posixprint(struct statfs *, long, int); int bread(int, off_t, void *, int); void usage(void); +void prthumanval(long long); +void prthuman(struct statfs *sfsp, long); int raw_df(char *, struct statfs *); extern int ffs_df(int, char *, struct statfs *); diff --git a/bin/ls/ls.h b/bin/ls/ls.h index b1b7053b5aa..a68a66f1833 100644 --- a/bin/ls/ls.h +++ b/bin/ls/ls.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ls.h,v 1.5 2003/06/02 23:32:08 millert Exp $ */ +/* $OpenBSD: ls.h,v 1.6 2003/07/02 21:19:33 deraadt Exp $ */ /* $NetBSD: ls.h,v 1.7 1995/03/21 09:06:33 cgd Exp $ */ /* @@ -71,3 +71,5 @@ typedef struct { char *flags; char data[1]; } NAMES; + +int ls_main(int, char *[]); diff --git a/bin/pax/getoldopt.c b/bin/pax/getoldopt.c index 4de13cd0d82..45fdbf29fbc 100644 --- a/bin/pax/getoldopt.c +++ b/bin/pax/getoldopt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getoldopt.c,v 1.7 2002/10/16 19:20:02 millert Exp $ */ +/* $OpenBSD: getoldopt.c,v 1.8 2003/07/02 21:19:33 deraadt Exp $ */ /* $NetBSD: getoldopt.c,v 1.3 1995/03/21 09:07:28 cgd Exp $ */ /* @@ -11,12 +11,16 @@ */ #ifndef lint -static const char rcsid[] = "$OpenBSD: getoldopt.c,v 1.7 2002/10/16 19:20:02 millert Exp $"; +static const char rcsid[] = "$OpenBSD: getoldopt.c,v 1.8 2003/07/02 21:19:33 deraadt Exp $"; #endif /* not lint */ +#include <sys/types.h> +#include <sys/stat.h> #include <stdio.h> #include <string.h> #include <unistd.h> +#include "pax.h" +#include "extern.h" int getoldopt(int argc, char **argv, const char *optstring) diff --git a/bin/ps/fmt.c b/bin/ps/fmt.c index 4fd82385392..c9a8677b5ef 100644 --- a/bin/ps/fmt.c +++ b/bin/ps/fmt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fmt.c,v 1.3 2003/06/11 06:50:24 deraadt Exp $ */ +/* $OpenBSD: fmt.c,v 1.4 2003/07/02 21:19:33 deraadt Exp $ */ /*- * Copyright (c) 1990, 1993, 1994 @@ -29,11 +29,22 @@ * SUCH DAMAGE. */ +#include <sys/param.h> +#include <sys/user.h> +#include <sys/time.h> +#include <sys/resource.h> +#include <sys/proc.h> +#include <sys/stat.h> +#include <sys/ioctl.h> +#include <sys/sysctl.h> +#include <sys/types.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> #include <vis.h> +#include "ps.h" +#include "extern.h" void fmt_puts(char *s, int *leftp) diff --git a/bin/stty/modes.c b/bin/stty/modes.c index a79953c1d3d..1a06d47927a 100644 --- a/bin/stty/modes.c +++ b/bin/stty/modes.c @@ -1,4 +1,4 @@ -/* $OpenBSD: modes.c,v 1.7 2003/06/11 23:42:12 deraadt Exp $ */ +/* $OpenBSD: modes.c,v 1.8 2003/07/02 21:19:33 deraadt Exp $ */ /* $NetBSD: modes.c,v 1.9 1996/05/07 18:20:09 jtc Exp $ */ /*- @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)modes.c 8.3 (Berkeley) 4/2/94"; #else -static char rcsid[] = "$OpenBSD: modes.c,v 1.7 2003/06/11 23:42:12 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: modes.c,v 1.8 2003/07/02 21:19:33 deraadt Exp $"; #endif #endif /* not lint */ @@ -42,6 +42,7 @@ static char rcsid[] = "$OpenBSD: modes.c,v 1.7 2003/06/11 23:42:12 deraadt Exp $ #include <stddef.h> #include <string.h> #include "stty.h" +#include "extern.h" struct modes { const char *name; |