diff options
author | Nick Clifton <nickc@redhat.com> | 2005-01-04 15:47:38 +0000 |
---|---|---|
committer | Nick Clifton <nickc@redhat.com> | 2005-01-04 15:47:38 +0000 |
commit | 8b626bcf2c36015a4488c30775d524c0c3be4b19 (patch) | |
tree | e7b8d1a10a8b8878f4d5f89dfde144a23c1ac04f /binutils/nlmconv.c | |
parent | 5f81b918e0b75dbd0feaace54f163982f2874316 (diff) | |
download | fsf-binutils-gdb-8b626bcf2c36015a4488c30775d524c0c3be4b19.zip fsf-binutils-gdb-8b626bcf2c36015a4488c30775d524c0c3be4b19.tar.gz fsf-binutils-gdb-8b626bcf2c36015a4488c30775d524c0c3be4b19.tar.bz2 |
PR binutils/630
* nlmconv.c (main): Only store the basename of the output filename in the
module table.
Diffstat (limited to 'binutils/nlmconv.c')
-rw-r--r-- | binutils/nlmconv.c | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/binutils/nlmconv.c b/binutils/nlmconv.c index 9b5e4c8..1bbd22a 100644 --- a/binutils/nlmconv.c +++ b/binutils/nlmconv.c @@ -1057,18 +1057,24 @@ main (int argc, char **argv) sharedhdr.exitProcedureOffset; free (data); } - len = strlen (output_file); - if (len > NLM_MODULE_NAME_SIZE - 2) - len = NLM_MODULE_NAME_SIZE - 2; - nlm_fixed_header (outbfd)->moduleName[0] = len; - - strncpy (nlm_fixed_header (outbfd)->moduleName + 1, output_file, - NLM_MODULE_NAME_SIZE - 2); - nlm_fixed_header (outbfd)->moduleName[NLM_MODULE_NAME_SIZE - 1] = '\0'; - for (modname = nlm_fixed_header (outbfd)->moduleName; - *modname != '\0'; - modname++) - *modname = TOUPPER (*modname); + + { + const int max_len = NLM_MODULE_NAME_SIZE - 2; + const char * filename = lbasename (output_file); + + len = strlen (filename); + if (len > max_len) + len = max_len; + nlm_fixed_header (outbfd)->moduleName[0] = len; + + strncpy (nlm_fixed_header (outbfd)->moduleName + 1, filename, max_len); + nlm_fixed_header (outbfd)->moduleName[max_len + 1] = '\0'; + + for (modname = nlm_fixed_header (outbfd)->moduleName; + *modname != '\0'; + modname++) + *modname = TOUPPER (*modname); + } strncpy (nlm_variable_header (outbfd)->oldThreadName, " LONG", NLM_OLD_THREAD_NAME_LENGTH); |