Author: pfg
Date: Wed Aug 8 15:12:32 2018
New Revision: 337457
URL: https://svnweb.freebsd.org/changeset/base/337457
Log:
Revert r337440: the log message is wrong.
Modified:
head/usr.bin/printf/printf.c
Modified: head/usr.bin/printf/printf.c
==============================================================================
--- head/usr.bin/printf/printf.c Wed Aug 8 15:08:22 2018
(r337456)
+++ head/usr.bin/printf/printf.c Wed Aug 8 15:12:32 2018
(r337457)
@@ -1,7 +1,6 @@
/*-
* SPDX-License-Identifier: BSD-3-Clause
*
- * Copyright 2018 Staysail Systems, Inc. <i...@staysail.tech>
* Copyright 2014 Garrett D'Amore <garr...@damore.org>
* Copyright 2010 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 1989, 1993
@@ -376,19 +375,16 @@ printf_doformat(char *fmt, int *rval)
char *p;
int getout;
- /* Convert "b" to "s" for output. */
- start[strlen(start) - 1] = 's';
- if ((p = strdup(getstr())) == NULL) {
+ p = strdup(getstr());
+ if (p == NULL) {
warnx("%s", strerror(ENOMEM));
return (NULL);
}
getout = escape(p, 0, &len);
- PF(start, p);
- /* Restore format for next loop. */
-
+ fputs(p, stdout);
free(p);
if (getout)
- exit(*rval);
+ return (end_fmt);
break;
}
case 'c': {
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
