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

removed duplicate code

Browse Source
This commit is contained in:
hyung-hwan
2025-06-04 12:51:01 +09:00
parent cbbc06179a
commit d235fa023d
11 changed files with 1455 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
bin/sed.c
View File

@ -98,24 +98,6 @@ struct arg_t
/* ------------------------------------------------------------------- */
static void print_error(const hawk_bch_t* fmt, ...)
{
va_list va;
fprintf (stderr, "ERROR: ");
va_start (va, fmt);
vfprintf (stderr, fmt, va);
va_end (va);
}
static void print_warning (const hawk_bch_t* fmt, ...)
{
va_list va;
fprintf (stderr, "WARNING: ");
va_start (va, fmt);
vfprintf (stderr, fmt, va);
va_end (va);
}
static void print_usage (FILE* out, const hawk_bch_t* argv0, const hawk_bch_t* real_argv0)
{
const hawk_bch_t* b1 = hawk_get_base_name_bcstr(real_argv0? real_argv0: argv0);
@ -164,7 +146,7 @@ static int add_script (const hawk_bch_t* str, int mem)
tmp = (hawk_sed_iostd_t*)realloc(g_script.io, HAWK_SIZEOF(*g_script.io) * (g_script.capa + 16 + 1));
if (tmp == HAWK_NULL)
{
print_error("out of memory while processing %s\n", str);
hawk_main_print_error("out of memory while processing %s\n", str);
return -1;
}
@ -228,21 +210,21 @@ static int handle_args (int argc, hawk_bch_t* argv[], const hawk_bch_t* real_arg
switch (c)
{
default:
print_usage (stderr, argv[0], real_argv0);
print_usage(stderr, argv[0], real_argv0);
goto oops;
case '?':
print_error("bad option - %c\n", opt.opt);
print_usage (stderr, argv[0], real_argv0);
hawk_main_print_error("bad option - %c\n", opt.opt);
print_usage(stderr, argv[0], real_argv0);
goto oops;
case ':':
print_error("bad parameter for %c\n", opt.opt);
print_usage (stderr, argv[0], real_argv0);
hawk_main_print_error("bad parameter for %c\n", opt.opt);
print_usage(stderr, argv[0], real_argv0);
goto oops;
case 'h':
print_usage (stdout, argv[0], real_argv0);
print_usage(stdout, argv[0], real_argv0);
goto done;
case 'D':
@ -302,7 +284,7 @@ static int handle_args (int argc, hawk_bch_t* argv[], const hawk_bch_t* real_arg
arg->trace = 1;
break;
#else
print_usage (stderr, argv[0], real_argv0);
print_usage(stderr, argv[0], real_argv0);
goto oops;
#endif
@ -321,7 +303,7 @@ static int handle_args (int argc, hawk_bch_t* argv[], const hawk_bch_t* real_arg
g_script_cmgr = hawk_get_cmgr_by_bcstr(opt.arg);
if (g_script_cmgr == HAWK_NULL)
{
print_error("unknown script encoding - %s\n", opt.arg);
hawk_main_print_error("unknown script encoding - %s\n", opt.arg);
goto oops;
}
}
@ -330,7 +312,7 @@ static int handle_args (int argc, hawk_bch_t* argv[], const hawk_bch_t* real_arg
g_infile_cmgr = hawk_get_cmgr_by_bcstr(opt.arg);
if (g_infile_cmgr == HAWK_NULL)
{
print_error("unknown input file encoding - %s\n", opt.arg);
hawk_main_print_error("unknown input file encoding - %s\n", opt.arg);
goto oops;
}
}
@ -339,7 +321,7 @@ static int handle_args (int argc, hawk_bch_t* argv[], const hawk_bch_t* real_arg
g_outfile_cmgr = hawk_get_cmgr_by_bcstr(opt.arg);
if (g_outfile_cmgr == HAWK_NULL)
{
print_error("unknown output file encoding - %s\n", opt.arg);
hawk_main_print_error("unknown output file encoding - %s\n", opt.arg);
goto oops;
}
}
@ -357,7 +339,7 @@ static int handle_args (int argc, hawk_bch_t* argv[], const hawk_bch_t* real_arg
if (g_script.size <= 0)
{
print_usage (stderr, argv[0], real_argv0);
print_usage(stderr, argv[0], real_argv0);
goto oops;
}
@ -373,17 +355,17 @@ done:
return 0;
}
void print_exec_error(hawk_sed_t* sed)
static void print_exec_error(hawk_sed_t* sed)
{
const hawk_loc_t* errloc = hawk_sed_geterrloc(sed);
if (errloc->line > 0 || errloc->colm > 0)
{
print_error("cannot execute - %s at line %lu column %lu\n",
hawk_main_print_error("cannot execute - %s at line %lu column %lu\n",
hawk_sed_geterrbmsg(sed), (unsigned long)errloc->line, (unsigned long)errloc->colm);
}
else
{
print_error("cannot execute - %s\n", hawk_sed_geterrbmsg(sed));
hawk_main_print_error("cannot execute - %s\n", hawk_sed_geterrbmsg(sed));
}
}
@ -721,7 +703,7 @@ int main_sed(int argc, hawk_bch_t* argv[], const hawk_bch_t* real_argv0)
{
if (hawk_init_xma_mmgr(&xma_mmgr, arg.memlimit) <= -1)
{
print_error("cannot open memory heap\n");
hawk_main_print_error("cannot open memory heap\n");
goto oops;
}
mmgr = &xma_mmgr;
@ -731,7 +713,7 @@ int main_sed(int argc, hawk_bch_t* argv[], const hawk_bch_t* real_argv0)
sed = hawk_sed_openstdwithmmgr(mmgr, 0, cmgr, HAWK_NULL);
if (!sed)
{
print_error("cannot open stream editor\n");
hawk_main_print_error("cannot open stream editor\n");
goto oops;
}
@ -760,13 +742,13 @@ int main_sed(int argc, hawk_bch_t* argv[], const hawk_bch_t* real_argv0)
if (errloc->line > 0 || errloc->colm > 0)
{
print_error("cannot compile %s - %s at line %lu column %lu\n",
hawk_main_print_error("cannot compile %s - %s at line %lu column %lu\n",
target, hawk_sed_geterrbmsg(sed), (unsigned long)errloc->line, (unsigned long)errloc->colm
);
}
else
{
print_error("cannot compile %s - %s\n", target, hawk_sed_geterrbmsg(sed));
hawk_main_print_error("cannot compile %s - %s\n", target, hawk_sed_geterrbmsg(sed));
}
goto oops;
}
@ -805,7 +787,7 @@ int main_sed(int argc, hawk_bch_t* argv[], const hawk_bch_t* real_argv0)
);
if (out_file.u.sio == HAWK_NULL)
{
print_error("cannot open %s\n", arg.output_file);
hawk_main_print_error("cannot open %s\n", arg.output_file);
goto oops;
}
@ -816,7 +798,7 @@ int main_sed(int argc, hawk_bch_t* argv[], const hawk_bch_t* real_argv0)
/* perform wild-card expansions for non-unix platforms */
if (expand_wildcards(argc - arg.infile_pos, &argv[arg.infile_pos], arg.wildcard, &xarg) <= -1)
{
print_error("out of memory\n");
hawk_main_print_error("out of memory\n");
goto oops;
}
@ -843,7 +825,7 @@ int main_sed(int argc, hawk_bch_t* argv[], const hawk_bch_t* real_argv0)
tmpl_tmpfile = hawk_gem_dupbcstrarr(hawk_sed_getgem(sed), f, HAWK_NULL);
if (tmpl_tmpfile == HAWK_NULL)
{
print_error("out of memory\n");
hawk_main_print_error("out of memory\n");
goto oops;
}
@ -864,7 +846,7 @@ int main_sed(int argc, hawk_bch_t* argv[], const hawk_bch_t* real_argv0)
{
if (retried)
{
print_error("cannot open %s\n", tmpl_tmpfile);
hawk_main_print_error("cannot open %s\n", tmpl_tmpfile);
hawk_sed_freemem(sed, tmpl_tmpfile);
goto oops;
}
@ -875,7 +857,7 @@ int main_sed(int argc, hawk_bch_t* argv[], const hawk_bch_t* real_argv0)
tmpl_tmpfile = hawk_gem_dupbcstr(hawk_sed_getgem(sed), "TMP-XXXX", HAWK_NULL);
if (tmpl_tmpfile == HAWK_NULL)
{
print_error("out of memory\n");
hawk_main_print_error("out of memory\n");
goto oops;
}
retried = 1;
@ -907,7 +889,7 @@ int main_sed(int argc, hawk_bch_t* argv[], const hawk_bch_t* real_argv0)
if (rename(tmpl_tmpfile, in[0].u.fileb.path) <= -1)
{
print_error("cannot rename %s to %s. not deleting %s\n",
hawk_main_print_error("cannot rename %s to %s. not deleting %s\n",
tmpl_tmpfile, in[0].u.fileb.path, tmpl_tmpfile);
hawk_sed_freemem(sed, tmpl_tmpfile);
goto oops;
@ -937,14 +919,14 @@ int main_sed(int argc, hawk_bch_t* argv[], const hawk_bch_t* real_argv0)
/* perform wild-card expansions for non-unix platforms */
if (expand_wildcards(argc - arg.infile_pos, &argv[arg.infile_pos], arg.wildcard, &xarg) <= -1)
{
print_error("out of memory\n");
hawk_main_print_error("out of memory\n");
goto oops;
}
in = (hawk_sed_iostd_t*)hawk_sed_allocmem(sed, HAWK_SIZEOF(*in) * (xarg.size + 1));
if (in == HAWK_NULL)
{
print_error("out of memory\n");
hawk_main_print_error("out of memory\n");
goto oops;
}