Fix build break

This commit is contained in:
Arun Prakash Jana 2019-12-12 20:11:31 +05:30
parent fd8a8387b8
commit 73593450ac
No known key found for this signature in database
GPG key ID: A75979F35C080412

View file

@ -598,7 +598,7 @@ static inline bool getutil(char *util);
static size_t mkpath(const char *dir, const char *name, char *out); static size_t mkpath(const char *dir, const char *name, char *out);
static void updateselbuf(const char *path, char *newpath); static void updateselbuf(const char *path, char *newpath);
static char *xgetenv(const char *name, char *fallback); static char *xgetenv(const char *name, char *fallback);
static void run_plugin(const char *plugin, char *newpath, const uchar flags); static void plugscript(const char *plugin, char *newpath, uchar flags);
/* Functions */ /* Functions */
@ -1043,7 +1043,7 @@ static void endselection(const char *path, char *newpath)
if (selbufpos) { /* File path(s) written to the buffer */ if (selbufpos) { /* File path(s) written to the buffer */
writesel(pselbuf, selbufpos - 1); /* Truncate NULL from end */ writesel(pselbuf, selbufpos - 1); /* Truncate NULL from end */
if (cfg.x11) if (cfg.x11)
run_plugin(utils[UTIL_CBCP], newpath, F_NOWAIT | F_NOTRACE); plugscript(utils[UTIL_CBCP], newpath, F_NOWAIT | F_NOTRACE);
} }
} }
} }
@ -3633,7 +3633,7 @@ static bool run_selected_plugin(char **path, const char *file, char *newpath, ch
return TRUE; return TRUE;
} }
static void run_plugin(const char *plugin, char *newpath, const uchar flags) static void plugscript(const char *plugin, char *newpath, uchar flags)
{ {
mkpath(plugindir, plugin, newpath); mkpath(plugindir, plugin, newpath);
if (!access(newpath, X_OK)) if (!access(newpath, X_OK))
@ -4864,7 +4864,7 @@ nochange:
appendfpath(newpath, mkpath(path, dents[cur].name, newpath)); appendfpath(newpath, mkpath(path, dents[cur].name, newpath));
writesel(pselbuf, selbufpos - 1); /* Truncate NULL from end */ writesel(pselbuf, selbufpos - 1); /* Truncate NULL from end */
if (cfg.x11) if (cfg.x11)
run_plugin(utils[UTIL_CBCP], newpath, F_NOWAIT | F_NOTRACE); plugscript(utils[UTIL_CBCP], newpath, F_NOWAIT | F_NOTRACE);
lastappendpos = selbufpos; lastappendpos = selbufpos;
selbufpos = utmp; selbufpos = utmp;
} }
@ -4949,7 +4949,7 @@ nochange:
if (selbufpos != utmp) { if (selbufpos != utmp) {
writesel(pselbuf, selbufpos - 1); /* Truncate NULL from end */ writesel(pselbuf, selbufpos - 1); /* Truncate NULL from end */
if (cfg.x11) if (cfg.x11)
run_plugin(utils[UTIL_CBCP], newpath, F_NOWAIT | F_NOTRACE); plugscript(utils[UTIL_CBCP], newpath, F_NOWAIT | F_NOTRACE);
/* Restore current selection buffer position */ /* Restore current selection buffer position */
lastappendpos = selbufpos; lastappendpos = selbufpos;
selbufpos = utmp; selbufpos = utmp;
@ -4974,7 +4974,7 @@ nochange:
printwait(msg, &presel); printwait(msg, &presel);
goto nochange; goto nochange;
} else if (cfg.x11) } else if (cfg.x11)
run_plugin(utils[UTIL_CBCP], newpath, F_NOWAIT | F_NOTRACE); plugscript(utils[UTIL_CBCP], newpath, F_NOWAIT | F_NOTRACE);
break; break;
case SEL_CP: // fallthrough case SEL_CP: // fallthrough
case SEL_MV: // fallthrough case SEL_MV: // fallthrough
@ -4988,7 +4988,7 @@ nochange:
/* Show notification on operation complete */ /* Show notification on operation complete */
if (cfg.x11) if (cfg.x11)
run_plugin(utils[UTIL_NTFY], newpath, F_NOWAIT | F_NOTRACE); plugscript(utils[UTIL_NTFY], newpath, F_NOWAIT | F_NOTRACE);
if (ndents) if (ndents)
copycurname(); copycurname();