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

Code reformat

Browse source
This commit is contained in:
Arun Prakash Jana 2019-01-21 21:50:29 +05:30
parent 7eb376bcc4
commit a3dfeafa56
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/nnn.c
View file

@ -458,7 +458,7 @@ static const char * const envs[] = {
/* Forward declarations */ /* Forward declarations */
static void redraw(char *path); static void redraw(char *path);
static void spawn(const char *file, const char *arg1, const char *arg2, const char *dir, uchar flag); static void spawn(const char *file, const char *arg1, const char *arg2, const char *dir, uchar flag);
int (*nftw_fn) (const char *fpath, const struct stat *sb, int typeflag, struct FTW *ftwbuf); static int (*nftw_fn) (const char *fpath, const struct stat *sb, int typeflag, struct FTW *ftwbuf);
/* Functions */ /* Functions */
@ -541,7 +541,7 @@ static int get_input(const char *prompt)
static char confirm_force() static char confirm_force()
{ {
int r = get_input("use force? ('y/Y' confirms, else interactive)"); int r = get_input("use force? (y/Y)");
if (r == 'y' || r == 'Y') if (r == 'y' || r == 'Y')
return 'f'; /* forceful */ return 'f'; /* forceful */
@ -786,10 +786,11 @@ static bool appendfpath(const char *path, const size_t len)
/* Write selected file paths to fd, linefeed separated */ /* Write selected file paths to fd, linefeed separated */
static ssize_t selectiontofd(int fd) static ssize_t selectiontofd(int fd)
{ {
uint lastpos = copybufpos - 1;
char *pbuf = pcopybuf; char *pbuf = pcopybuf;
ssize_t pos = 0, len, r, lastpos = copybufpos - 1; ssize_t pos = 0, len, r;
while (pos < copybufpos) { while (pos <= lastpos) {
len = strlen(pbuf); len = strlen(pbuf);
pos += len; pos += len;
@ -797,7 +798,7 @@ static ssize_t selectiontofd(int fd)
if (r != len) if (r != len)
return pos; return pos;
if (pos != lastpos) { if (pos <= lastpos) {
if (write(fd, "\n", 1) != 1) if (write(fd, "\n", 1) != 1)
return pos; return pos;
pbuf += pos + 1; pbuf += pos + 1;
@ -1185,7 +1186,6 @@ static int nextsel(int *presel)
#elif defined(BSD_KQUEUE) #elif defined(BSD_KQUEUE)
static struct kevent event_data[NUM_EVENT_SLOTS]; static struct kevent event_data[NUM_EVENT_SLOTS];
#endif #endif
c = *presel; c = *presel;
if (c == 0) { if (c == 0) {
@ -1228,9 +1228,8 @@ static int nextsel(int *presel)
idle = 0; idle = 0;
for (i = 0; i < len; ++i) for (i = 0; i < len; ++i)
if (c == bindings[i].sym) { if (c == bindings[i].sym)
return bindings[i].act; return bindings[i].act;
}
return 0; return 0;
} }
@ -3464,7 +3463,7 @@ nochange:
tmp = xreadline(NULL, "open with: "); tmp = xreadline(NULL, "open with: ");
break; break;
case SEL_NEW: case SEL_NEW:
tmp = xreadline(NULL, "name/link suffix [@ for no suffix]: "); tmp = xreadline(NULL, "name/link suffix [@ for none]: ");
break; break;
default: /* SEL_RENAME */ default: /* SEL_RENAME */
tmp = xreadline(dents[cur].name, ""); tmp = xreadline(dents[cur].name, "");