X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2Fmod%2Fsumversion.c;fp=scripts%2Fmod%2Fsumversion.c;h=43271a1ca01ec82017f7f6a40fd7c6b79c9d7987;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=8a2875689e4da48202ddc87468a23e0e8db58c58;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c
index 8a2875689..43271a1ca 100644
--- a/scripts/mod/sumversion.c
+++ b/scripts/mod/sumversion.c
@@ -316,7 +316,8 @@ static int parse_source_files(const char *objfile, struct md4_ctx *md)
 
 	file = grab_file(cmd, &flen);
 	if (!file) {
-		warn("could not find %s for %s\n", cmd, objfile);
+		fprintf(stderr, "Warning: could not find %s for %s\n",
+			cmd, objfile);
 		goto out;
 	}
 
@@ -354,8 +355,9 @@ static int parse_source_files(const char *objfile, struct md4_ctx *md)
 		/* Check if this file is in same dir as objfile */
 		if ((strstr(line, dir)+strlen(dir)-1) == strrchr(line, '/')) {
 			if (!parse_file(line, md)) {
-				warn("could not open %s: %s\n",
-				     line, strerror(errno));
+				fprintf(stderr,
+					"Warning: could not open %s: %s\n",
+					line, strerror(errno));
 				goto out_file;
 			}
 
@@ -381,11 +383,8 @@ void get_src_version(const char *modname, char sum[], unsigned sumlen)
 	struct md4_ctx md;
 	char *sources, *end, *fname;
 	const char *basename;
-	char filelist[PATH_MAX + 1];
-	char *modverdir = getenv("MODVERDIR");
-
-	if (!modverdir)
-		modverdir = ".";
+	char filelist[strlen(getenv("MODVERDIR")) + strlen("/") +
+		      strlen(modname) - strlen(".o") + strlen(".mod") + 1 ];
 
 	/* Source files for module are in .tmp_versions/modname.mod,
 	   after the first line. */
@@ -393,25 +392,28 @@ void get_src_version(const char *modname, char sum[], unsigned sumlen)
 		basename = strrchr(modname, '/') + 1;
 	else
 		basename = modname;
-	sprintf(filelist, "%s/%.*s.mod", modverdir,
+	sprintf(filelist, "%s/%.*s.mod", getenv("MODVERDIR"),
 		(int) strlen(basename) - 2, basename);
 
 	file = grab_file(filelist, &len);
 	if (!file) {
-		warn("could not find versions for %s\n", filelist);
+		fprintf(stderr, "Warning: could not find versions for %s\n",
+			filelist);
 		return;
 	}
 
 	sources = strchr(file, '\n');
 	if (!sources) {
-		warn("malformed versions file for %s\n", modname);
+		fprintf(stderr, "Warning: malformed versions file for %s\n",
+			modname);
 		goto release;
 	}
 
 	sources++;
 	end = strchr(sources, '\n');
 	if (!end) {
-		warn("bad ending versions file for %s\n", modname);
+		fprintf(stderr, "Warning: bad ending versions file for %s\n",
+			modname);
 		goto release;
 	}
 	*end = '\0';
@@ -436,19 +438,19 @@ static void write_version(const char *filename, const char *sum,
 
 	fd = open(filename, O_RDWR);
 	if (fd < 0) {
-		warn("changing sum in %s failed: %s\n",
+		fprintf(stderr, "Warning: changing sum in %s failed: %s\n",
 			filename, strerror(errno));
 		return;
 	}
 
 	if (lseek(fd, offset, SEEK_SET) == (off_t)-1) {
-		warn("changing sum in %s:%lu failed: %s\n",
+		fprintf(stderr, "Warning: changing sum in %s:%lu failed: %s\n",
 			filename, offset, strerror(errno));
 		goto out;
 	}
 
 	if (write(fd, sum, strlen(sum)+1) != strlen(sum)+1) {
-		warn("writing sum in %s failed: %s\n",
+		fprintf(stderr, "Warning: writing sum in %s failed: %s\n",
 			filename, strerror(errno));
 		goto out;
 	}