diff options
author | Ron Yorston <rmy@pobox.com> | 2023-04-21 15:05:49 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2023-04-21 15:05:49 +0100 |
commit | ff8242f51aac4e1b358eac833d6b384ebe1a1116 (patch) | |
tree | d97eb54db89b5a24eed8f03c8fc307c77f8eee95 | |
parent | 9ce85210e61e6c75adfc0ac0f54643cfee1353be (diff) | |
download | busybox-w32-ff8242f51aac4e1b358eac833d6b384ebe1a1116.tar.gz busybox-w32-ff8242f51aac4e1b358eac833d6b384ebe1a1116.tar.bz2 busybox-w32-ff8242f51aac4e1b358eac833d6b384ebe1a1116.zip |
win32: export xappendword()
The function xappendword() in make.c may have other uses. Export it.
-rw-r--r-- | include/mingw.h | 1 | ||||
-rw-r--r-- | miscutils/make.c | 13 | ||||
-rw-r--r-- | win32/mingw.c | 12 |
3 files changed, 13 insertions, 13 deletions
diff --git a/include/mingw.h b/include/mingw.h index 3cf0526f2..c2c37ba48 100644 --- a/include/mingw.h +++ b/include/mingw.h | |||
@@ -594,3 +594,4 @@ const char *applet_to_exe(const char *name); | |||
594 | char *get_user_name(void); | 594 | char *get_user_name(void); |
595 | char *quote_arg(const char *arg); | 595 | char *quote_arg(const char *arg); |
596 | char *find_first_executable(const char *name); | 596 | char *find_first_executable(const char *name); |
597 | char *xappendword(const char *str, const char *word); | ||
diff --git a/miscutils/make.c b/miscutils/make.c index eddc07126..07d824752 100644 --- a/miscutils/make.c +++ b/miscutils/make.c | |||
@@ -333,19 +333,6 @@ auto_concat(const char *s1, const char *s2) | |||
333 | return auto_string(xasprintf("%s%s", s1, s2)); | 333 | return auto_string(xasprintf("%s%s", s1, s2)); |
334 | } | 334 | } |
335 | 335 | ||
336 | /* | ||
337 | * Append a word to a space-separated string of words. The first | ||
338 | * call should use a NULL pointer for str, subsequent calls should | ||
339 | * pass an allocated string which will be freed. | ||
340 | */ | ||
341 | static char * | ||
342 | xappendword(const char *str, const char *word) | ||
343 | { | ||
344 | char *newstr = str ? xasprintf("%s %s", str, word) : xstrdup(word); | ||
345 | free((void *)str); | ||
346 | return newstr; | ||
347 | } | ||
348 | |||
349 | static unsigned int | 336 | static unsigned int |
350 | getbucket(const char *name) | 337 | getbucket(const char *name) |
351 | { | 338 | { |
diff --git a/win32/mingw.c b/win32/mingw.c index e81f17f11..9e1cf5eea 100644 --- a/win32/mingw.c +++ b/win32/mingw.c | |||
@@ -2389,3 +2389,15 @@ const char *applet_to_exe(const char *name) | |||
2389 | return name; | 2389 | return name; |
2390 | } | 2390 | } |
2391 | #endif | 2391 | #endif |
2392 | |||
2393 | /* | ||
2394 | * Append a word to a space-separated string of words. The first | ||
2395 | * call should use a NULL pointer for str, subsequent calls should | ||
2396 | * pass an allocated string which will be freed. | ||
2397 | */ | ||
2398 | char *xappendword(const char *str, const char *word) | ||
2399 | { | ||
2400 | char *newstr = str ? xasprintf("%s %s", str, word) : xstrdup(word); | ||
2401 | free((void *)str); | ||
2402 | return newstr; | ||
2403 | } | ||