From: Eric Andersen <andersen@codepoet.org>
Date: Fri, 26 Jan 2001 01:52:14 +0000 (-0000)
Subject: Fix a stupid bug I introduced yesterday.  Doh!
X-Git-Tag: 0_49~14
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=114ad9c753aeefac32a2d53b861790a4ecd5da30;p=oweals%2Fbusybox.git

Fix a stupid bug I introduced yesterday.  Doh!
 -Erik
---

diff --git a/insmod.c b/insmod.c
index c51ee4f32..c0c7d3183 100644
--- a/insmod.c
+++ b/insmod.c
@@ -78,7 +78,7 @@
 #ifndef MODUTILS_MODULE_H
 static const int MODUTILS_MODULE_H = 1;
 
-#ident "$Id: insmod.c,v 1.40 2001/01/25 04:11:06 andersen Exp $"
+#ident "$Id: insmod.c,v 1.41 2001/01/26 01:52:14 andersen Exp $"
 
 /* This file contains the structures used by the 2.0 and 2.1 kernels.
    We do not use the kernel headers directly because we do not wish
@@ -284,7 +284,7 @@ int delete_module(const char *);
 #ifndef MODUTILS_OBJ_H
 static const int MODUTILS_OBJ_H = 1;
 
-#ident "$Id: insmod.c,v 1.40 2001/01/25 04:11:06 andersen Exp $"
+#ident "$Id: insmod.c,v 1.41 2001/01/26 01:52:14 andersen Exp $"
 
 /* The relocatable object is manipulated using elfin types.  */
 
@@ -2932,10 +2932,10 @@ extern int insmod_main( int argc, char **argv)
 	if (len > 2 && tmp[len - 2] == '.' && tmp[len - 1] == 'o')
 		len -= 2;
 	strncpy(m_fullName, tmp, len);
-	strcat(m_fullName, ".o");
-	if (m_name == NULL) {
-		memcpy(m_name, tmp, len);
+	if (*m_name == '\0') {
+		strcpy(m_name, m_fullName);
 	}
+	strcat(m_fullName, ".o");
 
 	/* Get a filedesc for the module */
 	if ((fp = fopen(argv[optind], "r")) == NULL) {
diff --git a/modutils/insmod.c b/modutils/insmod.c
index c51ee4f32..c0c7d3183 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -78,7 +78,7 @@
 #ifndef MODUTILS_MODULE_H
 static const int MODUTILS_MODULE_H = 1;
 
-#ident "$Id: insmod.c,v 1.40 2001/01/25 04:11:06 andersen Exp $"
+#ident "$Id: insmod.c,v 1.41 2001/01/26 01:52:14 andersen Exp $"
 
 /* This file contains the structures used by the 2.0 and 2.1 kernels.
    We do not use the kernel headers directly because we do not wish
@@ -284,7 +284,7 @@ int delete_module(const char *);
 #ifndef MODUTILS_OBJ_H
 static const int MODUTILS_OBJ_H = 1;
 
-#ident "$Id: insmod.c,v 1.40 2001/01/25 04:11:06 andersen Exp $"
+#ident "$Id: insmod.c,v 1.41 2001/01/26 01:52:14 andersen Exp $"
 
 /* The relocatable object is manipulated using elfin types.  */
 
@@ -2932,10 +2932,10 @@ extern int insmod_main( int argc, char **argv)
 	if (len > 2 && tmp[len - 2] == '.' && tmp[len - 1] == 'o')
 		len -= 2;
 	strncpy(m_fullName, tmp, len);
-	strcat(m_fullName, ".o");
-	if (m_name == NULL) {
-		memcpy(m_name, tmp, len);
+	if (*m_name == '\0') {
+		strcpy(m_name, m_fullName);
 	}
+	strcat(m_fullName, ".o");
 
 	/* Get a filedesc for the module */
 	if ((fp = fopen(argv[optind], "r")) == NULL) {