modpost: use read_text_file() and get_line() for reading text files

grab_file() mmaps a file, but it is not so efficient here because
get_next_line() copies every line to the temporary buffer anyway.

read_text_file() and get_line() are simpler. get_line() exploits the
library function strchr().

Going forward, the missing *.symvers or *.cmd is a fatal error.
This should not happen because scripts/Makefile.modpost guards the
-i option files with $(wildcard $(input-symdump)).

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 0a844902998e05fb6718e65fc5d8a93eafe8b867..4fdf992e9729f55c36af37f76258899e6054a061 100644 (file)
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -2481,15 +2481,16 @@ static void write_if_changed(struct buffer *b, const char *fname)
  **/
 static void read_dump(const char *fname)
 {
-       unsigned long size, pos = 0;
-       void *file = grab_file(fname, &size);
-       char *line;
+       char *buf, *pos, *line;
 
-       if (!file)
+       buf = read_text_file(fname);
+       if (!buf)
                /* No symbol versions, silently ignore */
                return;
 
-       while ((line = get_next_line(&pos, file, size))) {
+       pos = buf;
+
+       while ((line = get_line(&pos))) {
                char *symname, *namespace, *modname, *d, *export;
                unsigned int crc;
                struct module *mod;
@@ -2524,10 +2525,10 @@ static void read_dump(const char *fname)
                sym_set_crc(symname, crc);
                sym_update_namespace(symname, namespace);
        }
-       release_file(file, size);
+       free(buf);
        return;
 fail:
-       release_file(file, size);
+       free(buf);
        fatal("parse error in symbol dump file\n");
 }
 

diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c
index 9f77c9dfce20560c67e15c510b5bc5c98a31e6fd..d587f40f11177ddb81f724757809c633b77195e5 100644 (file)
--- a/scripts/mod/sumversion.c
+++ b/scripts/mod/sumversion.c
@@ -303,9 +303,8 @@ static int is_static_library(const char *objfile)
  * to figure out source files. */
 static int parse_source_files(const char *objfile, struct md4_ctx *md)
 {
-       char *cmd, *file, *line, *dir;
+       char *cmd, *file, *line, *dir, *pos;
        const char *base;
-       unsigned long flen, pos = 0;
        int dirlen, ret = 0, check_files = 0;
 
        cmd = NOFAIL(malloc(strlen(objfile) + sizeof("..cmd")));
@@ -323,14 +322,12 @@ static int parse_source_files(const char *objfile, struct md4_ctx *md)
        strncpy(dir, objfile, dirlen);
        dir[dirlen] = '\0';
 
-       file = grab_file(cmd, &flen);
-       if (!file) {
-               warn("could not find %s for %s\n", cmd, objfile);
-               goto out;
-       }
+       file = read_text_file(cmd);
+
+       pos = file;
 
        /* Sum all files in the same dir or subdirs. */
-       while ((line = get_next_line(&pos, file, flen)) != NULL) {
+       while ((line = get_line(&pos))) {
                char* p = line;
 
                if (strncmp(line, "source_", sizeof("source_")-1) == 0) {
@@ -381,8 +378,7 @@ static int parse_source_files(const char *objfile, struct md4_ctx *md)
        /* Everyone parsed OK */
        ret = 1;
 out_file:
-       release_file(file, flen);
-out:
+       free(file);
        free(dir);
        free(cmd);
        return ret;