60 lines
1.4 KiB
Diff
60 lines
1.4 KiB
Diff
From 756acc92c9d6bea9929d9105207e081054be05fb Mon Sep 17 00:00:00 2001
|
|
From: Mark Nudelman <markn@greenwoodsoftware.com>
|
|
Date: Mon, 6 Nov 2023 11:44:08 -0800
|
|
Subject: [PATCH] Some constifying.
|
|
|
|
---
|
|
filename.c | 17 +++++++++--------
|
|
1 file changed, 9 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/filename.c b/filename.c
|
|
index a8726dc..672dc94 100644
|
|
--- a/filename.c
|
|
+++ b/filename.c
|
|
@@ -136,12 +136,13 @@ static int metachar(char c)
|
|
/*
|
|
* Insert a backslash before each metacharacter in a string.
|
|
*/
|
|
-public char * shell_quote(char *s)
|
|
+public char * shell_quote(constant char *s)
|
|
{
|
|
- char *p;
|
|
+ constant char *p;
|
|
+ char *np;
|
|
char *newstr;
|
|
int len;
|
|
- char *esc = get_meta_escape();
|
|
+ constant char *esc = get_meta_escape();
|
|
int esclen = (int) strlen(esc);
|
|
int use_quotes = 0;
|
|
int have_quotes = 0;
|
|
@@ -185,7 +186,7 @@ public char * shell_quote(char *s)
|
|
/*
|
|
* Allocate and construct the new string.
|
|
*/
|
|
- newstr = p = (char *) ecalloc(len, sizeof(char));
|
|
+ newstr = np = (char *) ecalloc(len, sizeof(char));
|
|
if (use_quotes)
|
|
{
|
|
SNPRINTF3(newstr, len, "%c%s%c", openquote, s, closequote);
|
|
@@ -198,12 +199,12 @@ public char * shell_quote(char *s)
|
|
/*
|
|
* Add the escape char.
|
|
*/
|
|
- strcpy(p, esc);
|
|
- p += esclen;
|
|
+ strcpy(np, esc);
|
|
+ np += esclen;
|
|
}
|
|
- *p++ = *s++;
|
|
+ *np++ = *s++;
|
|
}
|
|
- *p = '\0';
|
|
+ *np = '\0';
|
|
}
|
|
return (newstr);
|
|
}
|
|
--
|
|
2.43.0
|
|
|