files: tweak the function tail() and rename two variables

master
Benno Schulenberg 2016-04-23 13:23:49 +02:00
parent 8aeb8434d6
commit 5c5fefc8cf
2 changed files with 7 additions and 10 deletions

View File

@ -2927,18 +2927,15 @@ char *input_tab(char *buf, bool allow_files, size_t *place,
}
#endif /* !DISABLE_TABCOMP */
/* Only print the last part of a path. Isn't there a shell command for
* this? */
const char *tail(const char *foo)
/* Return the filename part of the given path. */
const char *tail(const char *path)
{
const char *tmp = strrchr(foo, '/');
const char *slash = strrchr(path, '/');
if (tmp == NULL)
tmp = foo;
if (slash == NULL)
return path;
else
tmp++;
return tmp;
return ++slash;
}
#ifndef DISABLE_HISTORIES

View File

@ -342,7 +342,7 @@ char **cwd_tab_completion(const char *buf, bool allow_files, size_t
char *input_tab(char *buf, bool allow_files, size_t *place,
bool *lastwastab, bool *listed);
#endif
const char *tail(const char *foo);
const char *tail(const char *path);
#ifndef DISABLE_HISTORIES
char *histfilename(void);
void load_history(void);