utils-std

commit: 2cb594ab23dbc1cee684ee04401be431444bda69
parent 474048430bfc18dc9369905417390b8c386d3417
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Fri, 30 May 2025 07:15:38 +0200

cmd/{echo,printf}: rename 'escape' decoding function to 'unescape'

Diffstat:
M
cmd/echo.c
8
++++----
M
cmd/printf.c
6
+++---

2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/cmd/echo.c b/cmd/echo.c
@@ -9,7 +9,7 @@
 #include <unistd.h> // write
 
 static void
-escape(char *str, size_t *len)
+unescape(char *str, size_t *len)
 {
 	char *start = str;
 	char *store = str;
@@ -35,7 +35,7 @@ escape(char *str, size_t *len)
 			*store = '\b';
 			break;
 		case 'c':
-			goto escape_end;
+			goto unescape_end;
 		case 'f':
 			*store = '\f';
 			break;
@@ -67,7 +67,7 @@ escape(char *str, size_t *len)
 		}
 	}
 
-escape_end:
+unescape_end:
 	*store = '\0';
 	*len = (size_t)(store - start);
 }
@@ -134,7 +134,7 @@ main(int argc, char *argv[])
 
 	if(opt_n) arg_len--; // no newline
 
-	if(opt_e) escape(*argv, &arg_len);
+	if(opt_e) unescape(*argv, &arg_len);
 
 	ssize_t nwrite = write(1, *argv, arg_len);
 	if(nwrite < (ssize_t)arg_len)
diff --git a/cmd/printf.c b/cmd/printf.c
@@ -32,7 +32,7 @@ isxdigit(int c)
 // len parameter needed because of NULL escapes
 // returns 1 for handling '\c' early ends
 static int
-escape(char *fmt, size_t *len, int percent)
+unescape(char *fmt, size_t *len, int percent)
 {
 	char *start = fmt;
 	char *store;
@@ -184,7 +184,7 @@ main(int argc, char *argv[])
 	char *fmt = argv[0];
 	size_t fmtlen = strlen(fmt);
 
-	if(escape(fmt, &fmtlen, 1) != 0) return 1;
+	if(unescape(fmt, &fmtlen, 1) != 0) return 1;
 
 	argc--;
 	argv++;
@@ -496,7 +496,7 @@ main(int argc, char *argv[])
 			{
 				size_t arglen = strlen(fmt_arg);
 
-				int clear = escape(fmt_arg, &arglen, 0);
+				int clear = unescape(fmt_arg, &arglen, 0);
 
 				if(arglen > precision) arglen = precision;