tweaks: move a general function to the utils.c file

master
Benno Schulenberg 2017-11-11 11:34:39 +01:00
parent dfcb1268ca
commit a7f5907b43
3 changed files with 12 additions and 12 deletions

View File

@ -2684,14 +2684,3 @@ char *input_tab(char *buf, bool allow_files, size_t *place,
return buf;
}
#endif /* ENABLE_TABCOMP */
/* Return the filename part of the given path. */
const char *tail(const char *path)
{
const char *slash = strrchr(path, '/');
if (slash == NULL)
return path;
else
return ++slash;
}

View File

@ -321,7 +321,6 @@ void free_chararray(char **array, size_t len);
char *input_tab(char *buf, bool allow_files, size_t *place,
bool *lastwastab, void (*refresh_func)(void), bool *listed);
#endif
const char *tail(const char *path);
/* Some functions in global.c. */
size_t length_of_list(int menu);
@ -581,6 +580,7 @@ void complete_a_word(void);
/* All functions in utils.c. */
void get_homedir(void);
const char *tail(const char *path);
char *concatenate(const char *path, const char *name);
#ifdef ENABLE_LINENUMBERS
int digits(ssize_t n);

View File

@ -53,6 +53,17 @@ void get_homedir(void)
}
}
/* Return the filename part of the given path. */
const char *tail(const char *path)
{
const char *slash = strrchr(path, '/');
if (slash == NULL)
return path;
else
return ++slash;
}
/* Return a copy of the two given strings, welded together. */
char *concatenate(const char *path, const char *name)
{