diff options
| author | ngie <ngie@FreeBSD.org> | 2015-12-13 21:09:46 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-12-13 21:09:46 +0000 |
| commit | 4380394990455e8964f466e8d745af43dc898519 (patch) | |
| tree | 3705cab50e561b728e85c49dd6abc99e53d97881 /lib/libc/regex | |
| parent | 8dd9ca5e2a1e7d0875e2dcdf0aaf18b9ca9016dc (diff) | |
| download | FreeBSD-src-4380394990455e8964f466e8d745af43dc898519.zip FreeBSD-src-4380394990455e8964f466e8d745af43dc898519.tar.gz | |
MFC r276737,r289369,r289376,r289424,r291219,r291382,r291385,r291908:
r276737 (by imp):
Remove old ioctl use and support, once and for all.
r289369 (by emaste):
newfs_msdos: rework option parsing to match NetBSD
NetBSD split newfs_msdos in two so that they can reuse the file system
creation part in makefs. This change is a step on the path of bringing
that support to FreeBSD.
Reviewed by: kib, pfg
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D3905
r289376 (by emaste):
newfs_msdos: move mkfs_msdos to separate file for later use in makefs
Sponsored by: The FreeBSD Foundation
r289424 (by emaste):
newfs_msdos: prefer snprintf to sprintf
Obtained from: NetBSD
Sponsored by: The FreeBSD Foundation
r291219 (by emaste):
newfs_msdos: rework error handling for eventual use in makefs
Return -1 on errors from mkfs_msdos() instead of err()/errx(), to
allow different consumers to handle errors as appropriate.
Obtained from: NetBSD
Sponsored by: The FreeBSD Foundation
r291382 (by emaste):
mkfs_msdos: sync with NetBSD
Add a sanity test and clean up whitespace.
Obtained from: NetBSD
r291385 (by emaste):
Use netbsd usage() implementation in newfs_msdos
In r289629 newfs_msdos option descriptions are available in
mkfs_msdos.h.
Obtained from: NetBSD
r291908:
Fix leak in mkfs_msdos(..) by initializing img to NULL and free'ing at the end
of the function
Differential Revision: https://reviews.freebsd.org/D4405
PR: 204943
Reviewed by: emaste, jilles
Reported by: David Binderman <dcb314@hotmail.com>
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'lib/libc/regex')
| -rw-r--r-- | lib/libc/regex/grot/Makefile | 3 | ||||
| -rw-r--r-- | lib/libc/regex/grot/main.c | 5 | ||||
| -rw-r--r-- | lib/libc/regex/grot/split.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/lib/libc/regex/grot/Makefile b/lib/libc/regex/grot/Makefile index 3e41724..e715dd8 100644 --- a/lib/libc/regex/grot/Makefile +++ b/lib/libc/regex/grot/Makefile @@ -62,7 +62,8 @@ regexec.o: engine.c engine.ih regerror.o: regerror.ih regerror.o: utils.h debug.o: debug.ih -main.o: main.ih +main.o: debug.ih main.ih split.ih +split.o: split.ih r: re tests ./re <tests diff --git a/lib/libc/regex/grot/main.c b/lib/libc/regex/grot/main.c index 5b50671..eee541b 100644 --- a/lib/libc/regex/grot/main.c +++ b/lib/libc/regex/grot/main.c @@ -9,7 +9,9 @@ __FBSDID("$FreeBSD$"); #include <string.h> #include <unistd.h> +#include "debug.ih" #include "main.ih" +#include "split.ih" char *progname; int debug = 0; @@ -22,9 +24,6 @@ regoff_t startoff = 0; regoff_t endoff = 0; -extern int split(); -extern void regprint(); - /* - main - do the simple case, hand off to regress() for regression */ diff --git a/lib/libc/regex/grot/split.c b/lib/libc/regex/grot/split.c index 07ab8f1..c5d5264 100644 --- a/lib/libc/regex/grot/split.c +++ b/lib/libc/regex/grot/split.c @@ -4,6 +4,8 @@ __FBSDID("$FreeBSD$"); #include <stdio.h> #include <string.h> +#include "split.ih" + /* - split - divide a string into fields, like awk split() == int split(char *string, char *fields[], int nfields, char *sep); |
