mirrors
/
nano
mirror of git://git.sv.gnu.org/nano.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tweaks: simplify the determination of a canonical path 

Suggested-by: Brand Huntsman <alpha@qzx.com>
This commit is contained in:
Benno Schulenberg 2019-09-17 13:31:09 +02:00
parent 21e307e820
commit d6e05d8376
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/color.c
View File

@ -26,7 +26,6 @@
#include <magic.h>
#endif
#include <string.h>
#include <unistd.h>
#ifdef ENABLE_COLOR
@ -192,17 +191,7 @@ void color_update(void)
/* If no syntax-override string was specified, or it didn't match,
* try finding a syntax based on the filename (extension). */
if (sint == NULL && !inhelp) {
char *reservation = charalloc(PATH_MAX + 1);
char *currentdir = getcwd(reservation, PATH_MAX + 1);
char *joinednames = charalloc(PATH_MAX + 1);
char *fullname = NULL;
/* When the specified filename is not absolute, concatenate it
* with the working directory and canonicalize the result. */
if (currentdir != NULL && openfile->filename[0] != '/') {
sprintf(joinednames, "%s/%s", currentdir, openfile->filename);
fullname = get_full_path(joinednames);
}
char *fullname = get_full_path(openfile->filename);
if (fullname == NULL)
fullname = mallocstrcpy(fullname, openfile->filename);
@ -213,8 +202,6 @@ void color_update(void)
}
free(fullname);
free(joinednames);
free(reservation);
}
/* If the filename didn't match anything, try the first line. */