nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 01:48:00 +00:00
Code Issues Projects Releases Wiki Activity

Add a Unicode version of split_into_argv().

Browse Source 
Created in the simplest way, by parametrising the existing code using
macros.

Nothing actually uses this yet. I hope to gradually switch
command-line parsing from 'ANSI' to Unicode strings, but this isn't
the only preparation needed, so it might yet be a while.
This commit is contained in:
Simon Tatham 2023-03-15 07:54:30 +00:00
parent acaa326fa5
commit 10e1ac7752
3 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
windows/CMakeLists.txt
View File

@ -34,6 +34,7 @@ add_sources_from_current_dir(utils
utils/security.c utils/security.c
utils/shinydialogbox.c utils/shinydialogbox.c
utils/split_into_argv.c utils/split_into_argv.c
utils/split_into_argv_w.c
utils/version.c utils/version.c
utils/win_strerror.c utils/win_strerror.c
unicode.c) unicode.c)

32
windows/utils/split_into_argv.c
View File

@ -161,17 +161,27 @@
#define MOD3 0 #define MOD3 0
#endif #endif
static inline bool is_word_sep(char c) #ifdef SPLIT_INTO_ARGV_W
#define FUNCTION split_into_argv_w
#define CHAR wchar_t
#define STRLEN wcslen
#else
#define FUNCTION split_into_argv
#define CHAR char
#define STRLEN strlen
#endif
static inline bool is_word_sep(CHAR c)
{ {
return c == ' ' || c == '\t'; return c == ' ' || c == '\t';
} }
void split_into_argv(char *cmdline, bool includes_program_name, void FUNCTION(CHAR *cmdline, bool includes_program_name,
int *argc, char ***argv, char ***argstart) int *argc, CHAR ***argv, CHAR ***argstart)
{ {
char *p; CHAR *p;
char *outputline, *q; CHAR *outputline, *q;
char **outputargv, **outputargstart; CHAR **outputargv, **outputargstart;
int outputargc; int outputargc;
/* /*
@ -190,9 +200,9 @@ void split_into_argv(char *cmdline, bool includes_program_name,
* This will guaranteeably be big enough; we can realloc it * This will guaranteeably be big enough; we can realloc it
* down later. * down later.
*/ */
outputline = snewn(1+strlen(cmdline), char); outputline = snewn(1+STRLEN(cmdline), CHAR);
outputargv = snewn(strlen(cmdline)+1 / 2, char *); outputargv = snewn(STRLEN(cmdline)+1 / 2, CHAR *);
outputargstart = snewn(strlen(cmdline)+1 / 2, char *); outputargstart = snewn(STRLEN(cmdline)+1 / 2, CHAR *);
p = cmdline; q = outputline; outputargc = 0; p = cmdline; q = outputline; outputargc = 0;
@ -299,8 +309,8 @@ void split_into_argv(char *cmdline, bool includes_program_name,
*q++ = '\0'; *q++ = '\0';
} }
outputargv = sresize(outputargv, outputargc, char *); outputargv = sresize(outputargv, outputargc, CHAR *);
outputargstart = sresize(outputargstart, outputargc, char *); outputargstart = sresize(outputargstart, outputargc, CHAR *);
if (argc) *argc = outputargc; if (argc) *argc = outputargc;
if (argv) *argv = outputargv; else sfree(outputargv); if (argv) *argv = outputargv; else sfree(outputargv);

6
windows/utils/split_into_argv_w.c Normal file
View File

@ -0,0 +1,6 @@
/*
* Unicode version of split_into_argv.
*/
#define SPLIT_INTO_ARGV_W
#include "split_into_argv.c"