mirrors
/
nnn
mirror of https://github.com/jarun/nnn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update patches

This commit is contained in:
Arun Prakash Jana 2022-07-29 22:41:17 +05:30
parent e73b57c78a
commit e298f7eeaf
No known key found for this signature in database
GPG Key ID: A75979F35C080412
4 changed files with 65 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
patches/README.md
View File

@ -25,6 +25,6 @@ Patch conflicts can be checked locally by running `make checkpatches` or by runn
Whenever patch conflicts occur on the latest master, pull requests resolving them are welcome. Let's say a conflict occurs in the `restorepreview` patch. The best way to resolve this conflict would be something along the lines of: Whenever patch conflicts occur on the latest master, pull requests resolving them are welcome. Let's say a conflict occurs in the `restorepreview` patch. The best way to resolve this conflict would be something along the lines of:
- Ensure you're on latest master and run `cp src/nnn.c src/nnn.c.orig && PATCH_OPTS="--merge" make O_RESTOREPREVIEW=1`. This will save a copy of the source from master in `src/nnn.c.orig` and generate conflict markers in `src/nnn.c`. - Ensure you're on latest master and run `PATCH_OPTS="--merge" make O_RESTOREPREVIEW=1`. This will generate the conflict markers in `src/nnn.c`.
- Next edit `src.nnn`, resolve all the conflicts around the conflict markers(`<<<<<<<`), and save. - Next edit `src/nnn.c`, resolve the conflicts around the conflict markers(`<<<<<<<`), and save.
- Then run `diff -u src/nnn.c.orig src/nnn.c > patch.diff` to generate the new patch file and copy the contents to `patches/restorepreview/mainline.diff` (keeping the description comment at the start of the file). - Then run `git diff > patch.diff && sed -i -e "/^$/{r patch.diff" -e "q;}" patches/restorepreview/mainline.diff` to update the patch.

4
patches/gitstatus/mainline.diff
View File

@ -215,8 +215,8 @@ index f8a2c58..157cea5 100644
while ((opt = (env_opts_id > 0 while ((opt = (env_opts_id > 0
? env_opts[--env_opts_id] ? env_opts[--env_opts_id]
- : getopt(argc, argv, "aAb:cCdDeEfF:gHiJKl:nop:P:QrRs:St:T:uUVxh"))) != -1) { - : getopt(argc, argv, "aAb:BcCdDeEfF:gHiJKl:nop:P:QrRs:St:T:uUVxh"))) != -1) {
+ : getopt(argc, argv, "aAb:cCdDeEfF:gGHiJKl:nop:P:QrRs:St:T:uUVxh"))) != -1) { + : getopt(argc, argv, "aAb:BcCdDeEfF:gGHiJKl:nop:P:QrRs:St:T:uUVxh"))) != -1) {
switch (opt) { switch (opt) {
#ifndef NOFIFO #ifndef NOFIFO
case 'a': case 'a':

4
patches/gitstatus/namefirst.diff
View File

@ -218,8 +218,8 @@ index ee1f5beb..91aab231 100644
while ((opt = (env_opts_id > 0 while ((opt = (env_opts_id > 0
? env_opts[--env_opts_id] ? env_opts[--env_opts_id]
- : getopt(argc, argv, "aAb:cCdDeEfF:gHiJKl:nop:P:QrRs:St:T:uUVxh"))) != -1) { - : getopt(argc, argv, "aAb:BcCdDeEfF:gHiJKl:nop:P:QrRs:St:T:uUVxh"))) != -1) {
+ : getopt(argc, argv, "aAb:cCdDeEfF:gGHiJKl:nop:P:QrRs:St:T:uUVxh"))) != -1) { + : getopt(argc, argv, "aAb:BcCdDeEfF:gGHiJKl:nop:P:QrRs:St:T:uUVxh"))) != -1) {
switch (opt) { switch (opt) {
#ifndef NOFIFO #ifndef NOFIFO
case 'a': case 'a':

52
patches/restorepreview/mainline.diff
View File

@ -7,20 +7,18 @@
# Authors: Luuk van Baal # Authors: Luuk van Baal
diff --git a/src/nnn.c b/src/nnn.c diff --git a/src/nnn.c b/src/nnn.c
index 6b0c1dc5..2aac557b 100644 index b10143a4..76d6bc5b 100644
--- a/src/nnn.c --- a/src/nnn.c
+++ b/src/nnn.c +++ b/src/nnn.c
@@ -372,7 +372,8 @@ typedef struct { @@ -374,6 +374,7 @@ typedef struct {
uint_t stayonsel : 1; /* Disable auto-advance on selection */
uint_t trash : 2; /* Trash method 0: rm -rf, 1: trash-cli, 2: gio trash */ uint_t trash : 2; /* Trash method 0: rm -rf, 1: trash-cli, 2: gio trash */
uint_t uidgid : 1; /* Show owner and group info */ uint_t uidgid : 1; /* Show owner and group info */
- uint_t reserved : 6; /* Adjust when adding/removing a field */ uint_t usebsdtar : 1; /* Use bsdtar as default archive utility */
+ uint_t previewer : 1; /* Run state of previewer */ + uint_t previewer : 1; /* Run state of previewer */
+ uint_t reserved : 5; /* Adjust when adding/removing a field */ uint_t reserved : 5; /* Adjust when adding/removing a field */
} runstate; } runstate;
/* Contexts or workspaces */ @@ -500,6 +501,9 @@ static char g_tmpfpath[TMP_LEN_MAX] __attribute__ ((aligned));
@@ -521,6 +522,9 @@ static char g_tmpfpath[TMP_LEN_MAX] __attribute__ ((aligned));
/* Buffer to store plugins control pipe location */ /* Buffer to store plugins control pipe location */
static char g_pipepath[TMP_LEN_MAX] __attribute__ ((aligned)); static char g_pipepath[TMP_LEN_MAX] __attribute__ ((aligned));
@ -30,7 +28,7 @@ index 6b0c1dc5..2aac557b 100644
/* Non-persistent runtime states */ /* Non-persistent runtime states */
static runstate g_state; static runstate g_state;
@@ -697,12 +701,13 @@ static const char * const messages[] = { @@ -676,12 +680,13 @@ static const char * const messages[] = {
#define NNN_FCOLORS 5 #define NNN_FCOLORS 5
#define NNNLVL 6 #define NNNLVL 6
#define NNN_PIPE 7 #define NNN_PIPE 7
@ -50,7 +48,7 @@ index 6b0c1dc5..2aac557b 100644
static const char * const env_cfg[] = { static const char * const env_cfg[] = {
"NNN_OPTS", "NNN_OPTS",
@@ -713,6 +718,7 @@ static const char * const env_cfg[] = { @@ -692,6 +697,7 @@ static const char * const env_cfg[] = {
"NNN_FCOLORS", "NNN_FCOLORS",
"NNNLVL", "NNNLVL",
"NNN_PIPE", "NNN_PIPE",
@ -58,7 +56,7 @@ index 6b0c1dc5..2aac557b 100644
"NNN_MCLICK", "NNN_MCLICK",
"NNN_SEL", "NNN_SEL",
"NNN_ARCHIVE", "NNN_ARCHIVE",
@@ -859,7 +865,7 @@ static int set_sort_flags(int r); @@ -833,7 +839,7 @@ static int set_sort_flags(int r);
static void statusbar(char *path); static void statusbar(char *path);
static bool get_output(char *file, char *arg1, char *arg2, int fdout, bool multi, bool page); static bool get_output(char *file, char *arg1, char *arg2, int fdout, bool multi, bool page);
#ifndef NOFIFO #ifndef NOFIFO
@ -67,7 +65,7 @@ index 6b0c1dc5..2aac557b 100644
#endif #endif
/* Functions */ /* Functions */
@@ -3071,7 +3077,7 @@ try_quit: @@ -3022,7 +3028,7 @@ try_quit:
} else { } else {
#ifndef NOFIFO #ifndef NOFIFO
if (!g_state.fifomode) if (!g_state.fifomode)
@ -76,7 +74,7 @@ index 6b0c1dc5..2aac557b 100644
#endif #endif
escaped = TRUE; escaped = TRUE;
settimeout(); settimeout();
@@ -5183,15 +5189,20 @@ static void run_cmd_as_plugin(const char *file, char *runfile, uchar_t flags) @@ -5120,15 +5126,20 @@ static void run_cmd_as_plugin(const char *file, char *runfile, uchar_t flags)
static bool plctrl_init(void) static bool plctrl_init(void)
{ {
@ -101,7 +99,7 @@ index 6b0c1dc5..2aac557b 100644
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
@@ -5220,6 +5231,21 @@ static ssize_t read_nointr(int fd, void *buf, size_t count) @@ -5157,6 +5168,21 @@ static ssize_t read_nointr(int fd, void *buf, size_t count)
return len; return len;
} }
@ -123,7 +121,7 @@ index 6b0c1dc5..2aac557b 100644
static char *readpipe(int fd, char *ctxnum, char **path) static char *readpipe(int fd, char *ctxnum, char **path)
{ {
char ctx, *nextpath = NULL; char ctx, *nextpath = NULL;
@@ -5904,7 +5930,7 @@ static void populate(char *path, char *lastname) @@ -5841,7 +5867,7 @@ static void populate(char *path, char *lastname)
} }
#ifndef NOFIFO #ifndef NOFIFO
@ -132,7 +130,7 @@ index 6b0c1dc5..2aac557b 100644
{ {
if (!fifopath) if (!fifopath)
return; return;
@@ -5920,6 +5946,12 @@ static void notify_fifo(bool force) @@ -5857,6 +5883,12 @@ static void notify_fifo(bool force)
} }
} }
@ -144,8 +142,8 @@ index 6b0c1dc5..2aac557b 100644
+ +
static struct entry lastentry; static struct entry lastentry;
if (!force && !memcmp(&lastentry, &pdents[cur], sizeof(struct entry))) if (!force && !memcmp(&lastentry, &pdents[cur], sizeof(struct entry))) // NOLINT
@@ -5952,7 +5984,7 @@ static void send_to_explorer(int *presel) @@ -5889,7 +5921,7 @@ static void send_to_explorer(int *presel)
if (fd > 1) if (fd > 1)
close(fd); close(fd);
} else } else
@ -154,7 +152,7 @@ index 6b0c1dc5..2aac557b 100644
} }
#endif #endif
@@ -5985,7 +6017,7 @@ static void move_cursor(int target, int ignore_scrolloff) @@ -5922,7 +5954,7 @@ static void move_cursor(int target, int ignore_scrolloff)
#ifndef NOFIFO #ifndef NOFIFO
if (!g_state.fifomode) if (!g_state.fifomode)
@ -163,7 +161,7 @@ index 6b0c1dc5..2aac557b 100644
#endif #endif
} }
@@ -6603,7 +6635,7 @@ static bool browse(char *ipath, const char *session, int pkey) @@ -6539,7 +6571,7 @@ static bool browse(char *ipath, const char *session, int pkey)
pEntry pent; pEntry pent;
enum action sel; enum action sel;
struct stat sb; struct stat sb;
@ -172,7 +170,7 @@ index 6b0c1dc5..2aac557b 100644
const uchar_t opener_flags = (cfg.cliopener ? F_CLI : (F_NOTRACE | F_NOSTDIN | F_NOWAIT)); const uchar_t opener_flags = (cfg.cliopener ? F_CLI : (F_NOTRACE | F_NOSTDIN | F_NOWAIT));
bool watch = FALSE, cd = TRUE; bool watch = FALSE, cd = TRUE;
ino_t inode = 0; ino_t inode = 0;
@@ -6861,7 +6893,7 @@ nochange: @@ -6797,7 +6829,7 @@ nochange:
move_cursor(r, 1); move_cursor(r, 1);
#ifndef NOFIFO #ifndef NOFIFO
else if ((event.bstate == BUTTON1_PRESSED) && !g_state.fifomode) else if ((event.bstate == BUTTON1_PRESSED) && !g_state.fifomode)
@ -181,7 +179,7 @@ index 6b0c1dc5..2aac557b 100644
#endif #endif
/* Handle right click selection */ /* Handle right click selection */
if (event.bstate == BUTTON3_PRESSED) { if (event.bstate == BUTTON3_PRESSED) {
@@ -7030,7 +7062,14 @@ nochange: @@ -6959,7 +6991,14 @@ nochange:
&& strstr(g_buf, "text") && strstr(g_buf, "text")
#endif #endif
) { ) {
@ -196,7 +194,7 @@ index 6b0c1dc5..2aac557b 100644
if (cfg.filtermode) { if (cfg.filtermode) {
presel = FILTER; presel = FILTER;
clearfilter(); clearfilter();
@@ -7340,8 +7379,14 @@ nochange: @@ -7272,8 +7311,14 @@ nochange:
copycurname(); copycurname();
goto nochange; goto nochange;
case SEL_EDIT: case SEL_EDIT:
@ -211,7 +209,7 @@ index 6b0c1dc5..2aac557b 100644
continue; continue;
default: /* SEL_LOCK */ default: /* SEL_LOCK */
lock_terminal(); lock_terminal();
@@ -7710,6 +7755,7 @@ nochange: @@ -7642,6 +7687,7 @@ nochange:
cd = FALSE; cd = FALSE;
goto begin; goto begin;
} }
@ -219,7 +217,7 @@ index 6b0c1dc5..2aac557b 100644
case SEL_PLUGIN: case SEL_PLUGIN:
/* Check if directory is accessible */ /* Check if directory is accessible */
if (!xdiraccess(plgpath)) { if (!xdiraccess(plgpath)) {
@@ -7735,6 +7781,12 @@ nochange: @@ -7667,6 +7713,12 @@ nochange:
goto nochange; goto nochange;
} }
@ -232,7 +230,7 @@ index 6b0c1dc5..2aac557b 100644
if (tmp[0] == '-' && tmp[1]) { if (tmp[0] == '-' && tmp[1]) {
++tmp; ++tmp;
r = FALSE; /* Do not refresh dir after completion */ r = FALSE; /* Do not refresh dir after completion */
@@ -7789,7 +7841,13 @@ nochange: @@ -7722,7 +7774,13 @@ nochange:
case SEL_SHELL: // fallthrough case SEL_SHELL: // fallthrough
case SEL_LAUNCH: // fallthrough case SEL_LAUNCH: // fallthrough
case SEL_PROMPT: case SEL_PROMPT:
@ -246,7 +244,7 @@ index 6b0c1dc5..2aac557b 100644
/* Continue in type-to-nav mode, if enabled */ /* Continue in type-to-nav mode, if enabled */
if (cfg.filtermode) if (cfg.filtermode)
@@ -8329,8 +8387,10 @@ static void cleanup(void) @@ -8263,8 +8321,10 @@ static void cleanup(void)
if (g_state.autofifo) if (g_state.autofifo)
unlink(fifopath); unlink(fifopath);
#endif #endif
@ -258,7 +256,7 @@ index 6b0c1dc5..2aac557b 100644
#ifdef DEBUG #ifdef DEBUG
disabledbg(); disabledbg();
#endif #endif
@@ -8828,7 +8888,7 @@ int main(int argc, char *argv[]) @@ -8769,7 +8829,7 @@ int main(int argc, char *argv[])
#ifndef NOFIFO #ifndef NOFIFO
if (!g_state.fifomode) if (!g_state.fifomode)