projects
/
zilutils.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2d462ff
)
Move stuff from main() to new build_output_filename(); bugfix +1
author
Jason Self
<j@jxself.org>
Tue, 6 Oct 2015 21:55:08 +0000
(14:55 -0700)
committer
Jason Self
<j@jxself.org>
Tue, 6 Oct 2015 21:55:08 +0000
(14:55 -0700)
zilasm/main.c
patch
|
blob
|
history
diff --git
a/zilasm/main.c
b/zilasm/main.c
index 30b96556a25ca90241c4fca60cfd8a57b3c105d3..409e16b186c62b70305371bdf747011fd984974c 100644
(file)
--- a/
zilasm/main.c
+++ b/
zilasm/main.c
@@
-133,7
+133,7
@@
void parse_zserial(void)
char *p = optarg;
while (*p && isalnum(*p))
p++;
char *p = optarg;
while (*p && isalnum(*p))
p++;
- if (!*p) /* ..optarg contains alphanumeric only? */
+ if (!*p)
/* ..optarg contains alphanumeric only? */
{
strncpy(Config.zserial, optarg, sizeof(Config.zserial));
return;
{
strncpy(Config.zserial, optarg, sizeof(Config.zserial));
return;
@@
-159,6
+159,14
@@
void new_file_suffix(char *result, size_t maxlen, const char *src, const char *n
result[maxlen] = 0;
}
result[maxlen] = 0;
}
+char *build_output_filename(const char basename[], const char *suffix)
+{
+ int n = strlen(basename) + strlen(suffix);
+ char *ofile = malloc(n + 1); /* todo!!! check for NULL. free. */
+ new_file_suffix(ofile, n, basename, suffix);
+ return ofile;
+}
+
int main(int argc, char *argv[], char *envp[])
{
const char *output_file = NULL;
int main(int argc, char *argv[], char *envp[])
{
const char *output_file = NULL;
@@
-196,16
+204,8
@@
int main(int argc, char *argv[], char *envp[])
int first_input_file = optind;
if (first_input_file >= argc)
wrong_arg("Missing input file\n");
int first_input_file = optind;
if (first_input_file >= argc)
wrong_arg("Missing input file\n");
-
if (!output_file)
if (!output_file)
- {
- const char suffix[] = ".dat";
- const char *input_file = argv[first_input_file];
- int n = strlen(input_file) + strlen(suffix);
- char *ofile = malloc(n); /* todo!!! check for NULL. free. */
- new_file_suffix(ofile, n, input_file, suffix);
- output_file = ofile;
- }
+ output_file = build_output_filename(argv[first_input_file], ".dat");
// TODO: Everything :)
// TODO: Everything :)