Module Name: src
Committed By: christos
Date: Sat Jan 12 21:50:29 UTC 2019
Modified Files:
src/lib/libwrap: expandm.c
Log Message:
Don't do %%m -> %%%m escaping, requested by gson@.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/libwrap/expandm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libwrap/expandm.c
diff -u src/lib/libwrap/expandm.c:1.3 src/lib/libwrap/expandm.c:1.4
--- src/lib/libwrap/expandm.c:1.3 Sat Jan 12 16:05:37 2019
+++ src/lib/libwrap/expandm.c Sat Jan 12 16:50:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: expandm.c,v 1.3 2019/01/12 21:05:37 kre Exp $ */
+/* $NetBSD: expandm.c,v 1.4 2019/01/12 21:50:29 christos Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: expandm.c,v 1.3 2019/01/12 21:05:37 kre Exp $");
+__RCSID("$NetBSD: expandm.c,v 1.4 2019/01/12 21:50:29 christos Exp $");
#include <stdio.h>
#include <string.h>
@@ -52,7 +52,7 @@ expandm(const char *fmt, const char *sf,
for (char *p = m; p >= ptr && *p == '%'; p--)
cnt++;
if (asprintf(&nbuf, "%s%.*s%s", buf ? buf : "",
- (int)(m - ptr), ptr, (cnt & 1) ? e : "%%m") == -1)
+ (int)(m - ptr), ptr, (cnt & 1) ? e : "%m") == -1)
goto out;
free(buf);
buf = nbuf;
@@ -77,7 +77,10 @@ int
main(int argc, char *argv[])
{
errno = ERANGE;
- printf("%s\n", expandm(argv[1], "", NULL));
+ printf(argv[1]);
+ printf("\n");
+ printf(expandm(argv[1], "\n", NULL));
+ printf("%s\n", expandm(argv[1], NULL, NULL));
return 0;
}
#endif
