mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-24 11:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename makepath() to mkpath()

Browse source
This commit is contained in:
sin 2015-11-26 15:33:49 +00:00
parent 16109053f5
commit 29701b4878
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
noice.c
View file

@ -106,7 +106,7 @@ int idle;
void printmsg(char *msg); void printmsg(char *msg);
void printwarn(void); void printwarn(void);
void printerr(int ret, char *prefix); void printerr(int ret, char *prefix);
char *makepath(char *dir, char *name); char *mkpath(char *dir, char *name);
#undef dprintf #undef dprintf
int int
@ -487,7 +487,7 @@ dentfill(char *path, struct entry **dents,
*dents = xrealloc(*dents, (n + 1) * sizeof(**dents)); *dents = xrealloc(*dents, (n + 1) * sizeof(**dents));
(*dents)[n].name = xstrdup(dp->d_name); (*dents)[n].name = xstrdup(dp->d_name);
/* Get mode flags */ /* Get mode flags */
newpath = makepath(path, dp->d_name); newpath = mkpath(path, dp->d_name);
r = lstat(newpath, &sb); r = lstat(newpath, &sb);
if (r == -1) if (r == -1)
printerr(1, "lstat"); printerr(1, "lstat");
@ -515,7 +515,7 @@ dentfree(struct entry *dents, int n)
} }
char * char *
makepath(char *dir, char *name) mkpath(char *dir, char *name)
{ {
char path[PATH_MAX]; char path[PATH_MAX];
@ -547,7 +547,7 @@ dentfind(struct entry *dents, int n, char *cwd, char *path)
return 0; return 0;
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
tmp = makepath(cwd, dents[i].name); tmp = mkpath(cwd, dents[i].name);
DPRINTF_S(path); DPRINTF_S(path);
DPRINTF_S(tmp); DPRINTF_S(tmp);
if (strcmp(tmp, path) == 0) { if (strcmp(tmp, path) == 0) {
@ -697,7 +697,7 @@ nochange:
goto nochange; goto nochange;
name = dents[cur].name; name = dents[cur].name;
newpath = makepath(path, name); newpath = mkpath(path, name);
DPRINTF_S(newpath); DPRINTF_S(newpath);
/* Get path info */ /* Get path info */
@ -763,7 +763,7 @@ nochange:
DPRINTF_S(fltr); DPRINTF_S(fltr);
/* Save current */ /* Save current */
if (n > 0) if (n > 0)
oldpath = makepath(path, dents[cur].name); oldpath = mkpath(path, dents[cur].name);
goto begin; goto begin;
case SEL_TYPE: case SEL_TYPE:
nowtyping = 1; nowtyping = 1;
@ -796,7 +796,7 @@ moretyping:
fltr = xstrdup(ifilter); fltr = xstrdup(ifilter);
/* Save current */ /* Save current */
if (n > 0) if (n > 0)
oldpath = makepath(path, dents[cur].name); oldpath = mkpath(path, dents[cur].name);
if (!nowtyping) if (!nowtyping)
free(tmp); free(tmp);
goto begin; goto begin;
@ -830,7 +830,7 @@ moretyping:
clearprompt(); clearprompt();
goto nochange; goto nochange;
} }
newpath = makepath(path, tmp); newpath = mkpath(path, tmp);
free(tmp); free(tmp);
if (canopendir(newpath) == 0) { if (canopendir(newpath) == 0) {
free(newpath); free(newpath);
@ -847,12 +847,12 @@ moretyping:
mtimeorder = !mtimeorder; mtimeorder = !mtimeorder;
/* Save current */ /* Save current */
if (n > 0) if (n > 0)
oldpath = makepath(path, dents[cur].name); oldpath = mkpath(path, dents[cur].name);
goto begin; goto begin;
case SEL_REDRAW: case SEL_REDRAW:
/* Save current */ /* Save current */
if (n > 0) if (n > 0)
oldpath = makepath(path, dents[cur].name); oldpath = mkpath(path, dents[cur].name);
goto begin; goto begin;
case SEL_RUN: case SEL_RUN:
run = xgetenv(env, run); run = xgetenv(env, run);