modpost: introduce get_basename() helper

The logic to retrieve the basename appears multiple times.
Factor out the common pattern into a helper function.

I copied kbasename() from include/linux/string.h and renamed it
to get_basename().

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>

diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index c35d22607978bf58678a4168e19ae4c5641e42ac..7f4c72eca72c1b99bc8961ad4180fba8813c5c1e 100644 (file)
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -98,6 +98,18 @@ static inline bool strends(const char *str, const char *postfix)
        return strcmp(str + strlen(str) - strlen(postfix), postfix) == 0;
 }
 
+/**
+ * get_basename - return the last part of a pathname.
+ *
+ * @path: path to extract the filename from.
+ */
+const char *get_basename(const char *path)
+{
+       const char *tail = strrchr(path, '/');
+
+       return tail ? tail + 1 : path;
+}
+
 char *read_text_file(const char *filename)
 {
        struct stat st;
@@ -1461,14 +1473,8 @@ static void extract_crcs_for_object(const char *object, struct module *mod)
        const char *base;
        int dirlen, ret;
 
-       base = strrchr(object, '/');
-       if (base) {
-               base++;
-               dirlen = base - object;
-       } else {
-               dirlen = 0;
-               base = object;
-       }
+       base = get_basename(object);
+       dirlen = base - object;
 
        ret = snprintf(cmd_file, sizeof(cmd_file), "%.*s.%s.cmd",
                       dirlen, object, base);
@@ -1703,11 +1709,7 @@ static void check_exports(struct module *mod)
                s->crc_valid = exp->crc_valid;
                s->crc = exp->crc;
 
-               basename = strrchr(mod->name, '/');
-               if (basename)
-                       basename++;
-               else
-                       basename = mod->name;
+               basename = get_basename(mod->name);
 
                if (!contains_namespace(&mod->imported_namespaces, exp->namespace)) {
                        modpost_log(!allow_missing_ns_imports,
@@ -1765,11 +1767,8 @@ static void check_modname_len(struct module *mod)
 {
        const char *mod_name;
 
-       mod_name = strrchr(mod->name, '/');
-       if (mod_name == NULL)
-               mod_name = mod->name;
-       else
-               mod_name++;
+       mod_name = get_basename(mod->name);
+
        if (strlen(mod_name) >= MODULE_NAME_LEN)
                error("module name is too long [%s.ko]\n", mod->name);
 }
@@ -1946,11 +1945,7 @@ static void add_depends(struct buffer *b, struct module *mod)
                        continue;
 
                s->module->seen = true;
-               p = strrchr(s->module->name, '/');
-               if (p)
-                       p++;
-               else
-                       p = s->module->name;
+               p = get_basename(s->module->name);
                buf_printf(b, "%s%s", first ? "" : ",", p);
                first = 0;
        }

diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
index 59366f456b76590b44b62742a6052f1792293d6f..9133e4c3803f041ab8462452e3a2a31f674d5b01 100644 (file)
--- a/scripts/mod/modpost.h
+++ b/scripts/mod/modpost.h
@@ -216,6 +216,7 @@ void get_src_version(const char *modname, char sum[], unsigned sumlen);
 /* from modpost.c */
 extern bool target_is_big_endian;
 extern bool host_is_big_endian;
+const char *get_basename(const char *path);
 char *read_text_file(const char *filename);
 char *get_line(char **stringp);
 void *sym_get_data(const struct elf_info *info, const Elf_Sym *sym);

diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c
index 6de9af17599d7cf7b6caeed56440360db805bac7..e79fc40d852f93dbfd9dc54166cea7c69643b705 100644 (file)
--- a/scripts/mod/sumversion.c
+++ b/scripts/mod/sumversion.c
@@ -309,15 +309,10 @@ static int parse_source_files(const char *objfile, struct md4_ctx *md)
 
        cmd = xmalloc(strlen(objfile) + sizeof("..cmd"));
 
-       base = strrchr(objfile, '/');
-       if (base) {
-               base++;
-               dirlen = base - objfile;
-               sprintf(cmd, "%.*s.%s.cmd", dirlen, objfile, base);
-       } else {
-               dirlen = 0;
-               sprintf(cmd, ".%s.cmd", objfile);
-       }
+       base = get_basename(objfile);
+       dirlen = base - objfile;
+       sprintf(cmd, "%.*s.%s.cmd", dirlen, objfile, base);
+
        dir = xmalloc(dirlen + 1);
        strncpy(dir, objfile, dirlen);
        dir[dirlen] = '\0';