chiark
/
gitweb
/
~mdw
/
termux-packages
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pass: Add comment on why we depend on coreutils
[termux-packages]
/
packages
/
nano
/
src-files.c.patch
diff --git
a/packages/nano/src-files.c.patch
b/packages/nano/src-files.c.patch
index b7d27aea2f7c957b84c90fd8990fd3e5baf9083c..936ed8c8efcd1ce3dcf45e8d07da375c08ca355b 100644
(file)
--- a/
packages/nano/src-files.c.patch
+++ b/
packages/nano/src-files.c.patch
@@
-1,7
+1,7
@@
-diff -u -r ../nano-2.8.
0
/src/files.c ./src/files.c
---- ../nano-2.8.
0/src/files.c 2017-03-24 18:58:22.000000000 +00
00
-+++ ./src/files.c 2017-0
4-02 08:55:48.207085424 +00
00
-@@ -23
62,7 +2362
,7 @@
+diff -u -r ../nano-2.8.
6
/src/files.c ./src/files.c
+--- ../nano-2.8.
6/src/files.c 2017-07-21 09:44:46.000000000 +02
00
++++ ./src/files.c 2017-0
7-22 16:01:40.806964191 +02
00
+@@ -23
37,7 +2337
,7 @@
get_homedir();
tilde_dir = mallocstrcpy(NULL, homedir);
} else {
get_homedir();
tilde_dir = mallocstrcpy(NULL, homedir);
} else {
@@
-10,12
+10,12
@@
diff -u -r ../nano-2.8.0/src/files.c ./src/files.c
const struct passwd *userdata;
tilde_dir = mallocstrncpy(NULL, buf, i + 1);
const struct passwd *userdata;
tilde_dir = mallocstrncpy(NULL, buf, i + 1);
-@@ -24
73,7 +2473
,7 @@
+@@ -24
51,7 +2451
,7 @@
*num_matches = 0;
-#ifdef HAVE_PWD_H
+#if defined(HAVE_PWD_H) && !defined(__ANDROID__)
*num_matches = 0;
-#ifdef HAVE_PWD_H
+#if defined(HAVE_PWD_H) && !defined(__ANDROID__)
- const struct passwd *userdata;
-
while ((userdata = getpwent()) != NULL) {
while ((userdata = getpwent()) != NULL) {
+ if (strncmp(userdata->pw_name, buf + 1, buf_len - 1) == 0) {
+ /* Cool, found a match. Add it to the list. This makes a