From owner-svn-src-all@freebsd.org Sat Dec 2 07:29:08 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A2202DF66AB; Sat, 2 Dec 2017 07:29:08 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 71AC7648C9; Sat, 2 Dec 2017 07:29:08 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vB27T7Pc015040; Sat, 2 Dec 2017 07:29:07 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB27T7qQ015039; Sat, 2 Dec 2017 07:29:07 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201712020729.vB27T7qQ015039@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sat, 2 Dec 2017 07:29:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r326457 - head/usr.sbin/efidp X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/usr.sbin/efidp X-SVN-Commit-Revision: 326457 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Dec 2017 07:29:08 -0000 Author: imp Date: Sat Dec 2 07:29:07 2017 New Revision: 326457 URL: https://svnweb.freebsd.org/changeset/base/326457 Log: Read multiple lines when parsing the data. Allow multiple device paths to be read when formatting device paths. Set the upper limit to 64k (most of these paths are < 64 bytes). Sponsored by: Netflix Modified: head/usr.sbin/efidp/efidp.c Modified: head/usr.sbin/efidp/efidp.c ============================================================================== --- head/usr.sbin/efidp/efidp.c Sat Dec 2 06:23:02 2017 (r326456) +++ head/usr.sbin/efidp/efidp.c Sat Dec 2 07:29:07 2017 (r326457) @@ -38,6 +38,8 @@ __FBSDID("$FreeBSD$"); #include #include +#define MAXSIZE 65536 /* Everyting will be smaller than this, most 1000x smaller */ + /* options descriptor */ static struct option longopts[] = { { "format", no_argument, NULL, 'f' }, @@ -63,18 +65,16 @@ read_file(int fd, void **rv) off_t off; ssize_t red; - len = 4096; + len = MAXSIZE; off = 0; retval = malloc(len); do { red = read(fd, retval + off, len - off); + if (red == 0) + break; off += red; - if (red < (ssize_t)(len - off)) + if (off == (off_t)len) break; - len *= 2; - retval = reallocf(retval, len); - if (retval == NULL) - return -1; } while (1); *rv = retval; @@ -112,44 +112,62 @@ parse_args(int argc, char **argv) } } +static char * +trim(char *s) +{ + char *t; + + while (isspace(*s)) + s++; + t = s + strlen(s) - 1; + while (t > s && isspace(*t)) + *t-- = '\0'; + return s; +} + int main(int argc, char **argv) { - void *data; - ssize_t len; + char buffer[MAXSIZE]; parse_args(argc, argv); - len = read_file(STDIN_FILENO, &data); - if (len == -1) - err(1, "read"); if (flag_format) { - char buffer[4096]; ssize_t fmtlen; + ssize_t len; + void *data; + size_t dplen; + const_efidp dp; - fmtlen = efidp_format_device_path(buffer, sizeof(buffer), - (const_efidp)data, len); - if (fmtlen > 0) - printf("%s\n", buffer); + len = read_file(STDIN_FILENO, &data); + if (len == -1) + err(1, "read"); + dp = (const_efidp)data; + while (len > 0) { + dplen = efidp_size(dp); + fmtlen = efidp_format_device_path(buffer, sizeof(buffer), + dp, dplen); + if (fmtlen > 0) + printf("%s\n", buffer); + len -= dplen; + dp = (const_efidp)((const char *)dp + dplen); + } free(data); } else if (flag_parse) { efidp dp; ssize_t dplen; - char *str, *walker; + char *walker; - dplen = 8192; + dplen = MAXSIZE; dp = malloc(dplen); - str = realloc(data, len + 1); - if (str == NULL || dp == NULL) + if (dp == NULL) errx(1, "Can't allocate memory."); - str[len] = '\0'; - walker = str; - while (isspace(*walker)) - walker++; - dplen = efidp_parse_device_path(walker, dp, dplen); - if (dplen == -1) - errx(1, "Can't parse %s", walker); - write(STDOUT_FILENO, dp, dplen); + while (fgets(buffer, sizeof(buffer), stdin)) { + walker= trim(buffer); + dplen = efidp_parse_device_path(walker, dp, dplen); + if (dplen == -1) + errx(1, "Can't parse %s", walker); + write(STDOUT_FILENO, dp, dplen); + } free(dp); - free(str); } }