hyung-hwan/hawk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

restored self wildcard expansion in sed and cut

Browse Source
This commit is contained in:
hyung-hwan 2025-06-14 09:22:02 +09:00
parent 24c48fab9a
commit a88900b7af
2 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
bin/cut.c
View File

@ -30,6 +30,7 @@
#include <hawk-fmt.h> #include <hawk-fmt.h>
#include <hawk-utl.h> #include <hawk-utl.h>
#include <hawk-std.h> #include <hawk-std.h>
#include <hawk-glob.h>
#include <hawk-xma.h> #include <hawk-xma.h>
#if !defined(_GNU_SOURCE) #if !defined(_GNU_SOURCE)
@ -105,8 +106,8 @@ static void print_usage (FILE* out, const hawk_bch_t* argv0, const hawk_bch_t* r
fprintf (out, "Selector as follows:\n"); fprintf (out, "Selector as follows:\n");
fprintf (out, " 'd' followed by a delimiter character\n"); fprintf (out, " 'd' followed by a delimiter character\n");
fprintf (out, " 'D' followed by an input delimiter character and an output delimiter character\n"); fprintf (out, " 'D' followed by an input delimiter character and an output delimiter character\n");
fprintf (out, " 'f' followed by a field number or field number range\n"); fprintf (out, " 'f' followed by a field number or a field number range\n");
fprintf (out, " 'c' followed by a character position or character position range\n"); fprintf (out, " 'c' followed by a character position or a character position range\n");
fprintf (out, " for example, 'f3-5 c1-2 f4 D:,'\n"); fprintf (out, " for example, 'f3-5 c1-2 f4 D:,'\n");
fprintf (out, "Options as follows:\n"); fprintf (out, "Options as follows:\n");
fprintf (out, " -h/--help show this message\n"); fprintf (out, " -h/--help show this message\n");
@ -186,7 +187,7 @@ static int handle_args (int argc, hawk_bch_t* argv[], const hawk_bch_t* real_arg
}; };
static hawk_bcli_t opt = static hawk_bcli_t opt =
{ {
"hDe:f:om:w", "hDe:f:o:m:w",
lng lng
}; };
hawk_bci_t c; hawk_bci_t c;
@ -549,7 +550,7 @@ static void purge_xarg (xarg_t* xarg)
} }
} }
static int expand_wildcards (int argc, hawk_bch_t* argv[], int glob, xarg_t* xarg) static int expand_wildcard (int argc, hawk_bch_t* argv[], int do_glob, xarg_t* xarg)
{ {
int i; int i;
hawk_bcs_t tmp; hawk_bcs_t tmp;
@ -558,23 +559,22 @@ static int expand_wildcards (int argc, hawk_bch_t* argv[], int glob, xarg_t* xar
{ {
int x; int x;
#if 0 if (do_glob)
if (glob)
{ {
int glob_flags;
hawk_gem_t fake_gem; /* guly to use this fake gem here */
glob_flags = HAWK_GLOB_TOLERANT | HAWK_GLOB_PERIOD;
#if defined(_WIN32) || defined(__OS2__) || defined(__DOS__) #if defined(_WIN32) || defined(__OS2__) || defined(__DOS__)
int glob_flags = HAWK_GLOB_TOLERANT | HAWK_GLOB_PERIOD | HAWK_GLOB_NOESCAPE | HAWK_GLOB_IGNORECASE; glob_flags |= HAWK_GLOB_NOESCAPE | HAWK_GLOB_IGNORECASE;
#else
int glob_flags = HAWK_GLOB_TOLERANT | HAWK_GLOB_PERIOD;
#endif #endif
x = hawk_glob(argv[i], collect_into_xarg, xarg, glob_flags, xarg->mmgr, hawk_getdflcmgr()); fake_gem.mmgr = hawk_get_sys_mmgr();
fake_gem.cmgr = hawk_get_cmgr_by_id(HAWK_CMGR_UTF8); /* TODO: system default? */
x = hawk_gem_bglob(&fake_gem, argv[i], collect_into_xarg, xarg, glob_flags);
if (x <= -1) return -1; if (x <= -1) return -1;
} }
else x = 0; else x = 0;
#else
x = 0;
#endif
if (x == 0) if (x == 0)
{ {
@ -585,6 +585,7 @@ static int expand_wildcards (int argc, hawk_bch_t* argv[], int glob, xarg_t* xar
} }
} }
xarg->ptr[xarg->size] = HAWK_NULL;
return 0; return 0;
} }
@ -700,7 +701,7 @@ int main_cut(int argc, hawk_bch_t* argv[], const hawk_bch_t* real_argv0)
} }
/* perform wild-card expansions for non-unix platforms */ /* perform wild-card expansions for non-unix platforms */
if (expand_wildcards(argc - arg.infile_pos, &argv[arg.infile_pos], arg.wildcard, &xarg) <= -1) if (expand_wildcard(argc - arg.infile_pos, &argv[arg.infile_pos], arg.wildcard, &xarg) <= -1)
{ {
hawk_main_print_error("out of memory\n"); hawk_main_print_error("out of memory\n");
goto oops; goto oops;
@ -821,7 +822,7 @@ int main_cut(int argc, hawk_bch_t* argv[], const hawk_bch_t* real_argv0)
/* input files are specified on the command line */ /* input files are specified on the command line */
/* perform wild-card expansions for non-unix platforms */ /* perform wild-card expansions for non-unix platforms */
if (expand_wildcards(argc - arg.infile_pos, &argv[arg.infile_pos], arg.wildcard, &xarg) <= -1) if (expand_wildcard(argc - arg.infile_pos, &argv[arg.infile_pos], arg.wildcard, &xarg) <= -1)
{ {
hawk_main_print_error("out of memory\n"); hawk_main_print_error("out of memory\n");
goto oops; goto oops;

27
bin/sed.c
View File

@ -30,6 +30,7 @@
#include <hawk-fmt.h> #include <hawk-fmt.h>
#include <hawk-utl.h> #include <hawk-utl.h>
#include <hawk-std.h> #include <hawk-std.h>
#include <hawk-glob.h>
#include <hawk-xma.h> #include <hawk-xma.h>
#if !defined(_GNU_SOURCE) #if !defined(_GNU_SOURCE)
@ -641,7 +642,7 @@ static void purge_xarg (xarg_t* xarg)
} }
} }
static int expand_wildcards (int argc, hawk_bch_t* argv[], int glob, xarg_t* xarg) static int expand_wildcard (int argc, hawk_bch_t* argv[], int do_glob, xarg_t* xarg)
{ {
int i; int i;
hawk_bcs_t tmp; hawk_bcs_t tmp;
@ -650,23 +651,22 @@ static int expand_wildcards (int argc, hawk_bch_t* argv[], int glob, xarg_t* xar
{ {
int x; int x;
#if 0 if (do_glob)
if (glob)
{ {
int glob_flags;
hawk_gem_t fake_gem; /* guly to use this fake gem here */
glob_flags = HAWK_GLOB_TOLERANT | HAWK_GLOB_PERIOD;
#if defined(_WIN32) || defined(__OS2__) || defined(__DOS__) #if defined(_WIN32) || defined(__OS2__) || defined(__DOS__)
int glob_flags = HAWK_GLOB_TOLERANT | HAWK_GLOB_PERIOD | HAWK_GLOB_NOESCAPE | HAWK_GLOB_IGNORECASE; glob_flags |= HAWK_GLOB_NOESCAPE | HAWK_GLOB_IGNORECASE;
#else
int glob_flags = HAWK_GLOB_TOLERANT | HAWK_GLOB_PERIOD;
#endif #endif
x = hawk_glob(argv[i], collect_into_xarg, xarg, glob_flags, xarg->mmgr, hawk_getdflcmgr()); fake_gem.mmgr = hawk_get_sys_mmgr();
fake_gem.cmgr = hawk_get_cmgr_by_id(HAWK_CMGR_UTF8); /* TODO: system default? */
x = hawk_gem_bglob(&fake_gem, argv[i], collect_into_xarg, xarg, glob_flags);
if (x <= -1) return -1; if (x <= -1) return -1;
} }
else x = 0; else x = 0;
#else
x = 0;
#endif
if (x == 0) if (x == 0)
{ {
@ -677,6 +677,7 @@ static int expand_wildcards (int argc, hawk_bch_t* argv[], int glob, xarg_t* xar
} }
} }
xarg->ptr[xarg->size] = HAWK_NULL;
return 0; return 0;
} }
@ -796,7 +797,7 @@ int main_sed(int argc, hawk_bch_t* argv[], const hawk_bch_t* real_argv0)
} }
/* perform wild-card expansions for non-unix platforms */ /* perform wild-card expansions for non-unix platforms */
if (expand_wildcards(argc - arg.infile_pos, &argv[arg.infile_pos], arg.wildcard, &xarg) <= -1) if (expand_wildcard(argc - arg.infile_pos, &argv[arg.infile_pos], arg.wildcard, &xarg) <= -1)
{ {
hawk_main_print_error("out of memory\n"); hawk_main_print_error("out of memory\n");
goto oops; goto oops;
@ -917,7 +918,7 @@ int main_sed(int argc, hawk_bch_t* argv[], const hawk_bch_t* real_argv0)
/* input files are specified on the command line */ /* input files are specified on the command line */
/* perform wild-card expansions for non-unix platforms */ /* perform wild-card expansions for non-unix platforms */
if (expand_wildcards(argc - arg.infile_pos, &argv[arg.infile_pos], arg.wildcard, &xarg) <= -1) if (expand_wildcard(argc - arg.infile_pos, &argv[arg.infile_pos], arg.wildcard, &xarg) <= -1)
{ {
hawk_main_print_error("out of memory\n"); hawk_main_print_error("out of memory\n");
goto oops; goto oops;