diff -Nur ksymoops-2.4.10/Changelog ksymoops-2.4.11/Changelog --- ksymoops-2.4.10/Changelog 2004-11-21 12:06:05.000000000 +1100 +++ ksymoops-2.4.11/Changelog 2005-01-09 00:43:35.000000000 +1100 @@ -1,3 +1,9 @@ +2005-01-09 Keith Owens + + ksymoops 2.4.11 + + * Tweak nm command when target is NULL. Marty Leisner. + 2004-11-21 Keith Owens ksymoops 2.4.10 diff -Nur ksymoops-2.4.10/ksymoops.c ksymoops-2.4.11/ksymoops.c --- ksymoops-2.4.10/ksymoops.c 2004-11-21 12:06:05.000000000 +1100 +++ ksymoops-2.4.11/ksymoops.c 2005-01-09 00:30:36.000000000 +1100 @@ -9,7 +9,7 @@ Released under the GNU Public Licence, Version 2. */ -#define VERSION "2.4.10" +#define VERSION "2.4.11" #include "ksymoops.h" #include diff -Nur ksymoops-2.4.10/ksymoops.spec ksymoops-2.4.11/ksymoops.spec --- ksymoops-2.4.10/ksymoops.spec 2004-11-21 12:45:05.000000000 +1100 +++ ksymoops-2.4.11/ksymoops.spec 2005-01-09 00:30:36.000000000 +1100 @@ -1,6 +1,6 @@ Summary: Kernel oops and error message decoder Name: ksymoops -Version: 2.4.10 +Version: 2.4.11 Release: 1 Copyright: GPL Group: Utilities/System diff -Nur ksymoops-2.4.10/object.c ksymoops-2.4.11/object.c --- ksymoops-2.4.10/object.c 2004-11-21 12:06:05.000000000 +1100 +++ ksymoops-2.4.11/object.c 2005-01-09 00:40:03.000000000 +1100 @@ -25,15 +25,19 @@ if (!regular_file(file, procname)) return; - cmd_strlen = strlen(path_nm)+1+strlen(nm_options)+strlen(options->target)+1+strlen(file)+1; + cmd_strlen = strlen(path_nm)+1 + strlen(file)+1; + if (options->target) + cmd_strlen += sizeof(nm_options) + strlen(options->target) + 1; cmd = malloc(cmd_strlen); if (!cmd) malloc_error("nm command"); strcpy(cmd, path_nm); strcat(cmd, " "); - strcat(cmd, nm_options); - strcat(cmd, options->target); - strcat(cmd, " "); + if (options->target) { + strcat(cmd, nm_options); + strcat(cmd, options->target); + strcat(cmd, " "); + } strcat(cmd, file); DEBUG(2, "command '%s'", cmd); if (!(f = popen_local(cmd, procname)))