Simplify para_basename().

No need to allocate additional memory. This saves a malloc/free
in the hot path of com_ls(), the only caller. Also take care for
the case basename == NULL.

diff --git a/aft.c b/aft.c
index 51703aa4583ace19696db9e317e9135a9d285904..6481f3e4d6b031351b4b4ae09c410b3c4c0fc771 100644 (file)
--- a/aft.c
+++ b/aft.c
@@ -804,8 +804,8 @@ static char *make_image_lines(struct afs_info *afsi)
 
 static char *make_filename_lines(const char *path, unsigned flags)
 {
 
 static char *make_filename_lines(const char *path, unsigned flags)
 {

-       char *basename, *dirname;
-       char *ret;
+       char *dirname, *ret;
+       const char *basename;

 
        if (!(flags & LS_FLAG_FULL_PATH))
                return make_message("%s: %s\n",
 
        if (!(flags & LS_FLAG_FULL_PATH))
                return make_message("%s: %s\n",


@@ -814,9 +814,8 @@ static char *make_filename_lines(const char *path, unsigned flags)
        dirname = para_dirname(path);
        ret = make_message("%s: %s\n%s: %s\n%s: %s\n",
                status_item_list[SI_PATH], path,
        dirname = para_dirname(path);
        ret = make_message("%s: %s\n%s: %s\n%s: %s\n",
                status_item_list[SI_PATH], path,

-               status_item_list[SI_DIRECTORY], dirname,
-               status_item_list[SI_BASENAME], basename);
-       free(basename);
+               status_item_list[SI_DIRECTORY], dirname? dirname : "?",
+               status_item_list[SI_BASENAME], basename? basename : "?");

        free(dirname);
        return ret;
 }
        free(dirname);
        return ret;
 }

diff --git a/string.c b/string.c
index 8c97ccf75e22397fe3929e84340a05f00b43003c..2b361aee8372e3fd58bb1aab1523acc98b33926b 100644 (file)
--- a/string.c
+++ b/string.c
@@ -189,29 +189,27 @@ __must_check __malloc char *para_dirname(const char *name)
 }
 
 /**
 }
 
 /**

- * paraslash's version of basename()
+ * Paraslash's version of basename().

  *
  *

- * \param name Pointer to the full path
+ * \param name Pointer to the full path.

  *
  *

- * Compute the filename component of \p name
+ * Compute the filename component of \a name.

  *
  *

- * \return If \p name is \p NULL or the empty string, return \p NULL,
- * Otherwise, make a copy of \p name and return its filename component. Caller
- * is responsible to free the result.
+ * \return \p NULL if (a) \a name is the empty string of \p NULL, or (b) name
+ * ends with a slash.  Otherwise, a pointer within \a name is returned.  Caller
+ * must not free the result.

  */
  */

-__must_check __malloc char *para_basename(const char *name)
+__must_check const char *para_basename(const char *name)

 {
 {

-       char *p;
+       const char *ret;

 
        if (!name || !*name)
                return NULL;
 
        if (!name || !*name)
                return NULL;

-       p = strrchr(name, '/');
-       if (!p)
-               return para_strdup(name);
-       p++;
-       if (!*p)
-               return NULL;
-       return para_strdup(p);
+       ret = strrchr(name, '/');
+       if (!ret)
+               return name;
+       ret++;
+       return ret;

 }
 
 /**
 }
 
 /**

diff --git a/string.h b/string.h
index eb29b919c429da0a9ddb7024b785362bf9ba6623..febe1a025001c440d02c0de782788bddca1837a5 100644 (file)
--- a/string.h
+++ b/string.h
@@ -23,7 +23,7 @@ __must_check __malloc char *para_strdup(const char *s);
 __must_check __malloc __printf_1_2 char *make_message(const char *fmt, ...);
 __must_check __malloc char *para_strcat(char *a, const char *b);
 __must_check __malloc char *para_dirname(const char *name);
 __must_check __malloc __printf_1_2 char *make_message(const char *fmt, ...);
 __must_check __malloc char *para_strcat(char *a, const char *b);
 __must_check __malloc char *para_dirname(const char *name);

-__must_check __malloc char *para_basename(const char *name);
+__must_check const char *para_basename(const char *name);

 void chop(char* buf);
 __must_check __malloc char *para_tmpname(void);
 __must_check int para_mkstemp(char *template, mode_t mode);
 void chop(char* buf);
 __must_check __malloc char *para_tmpname(void);
 __must_check int para_mkstemp(char *template, mode_t mode);