pool/tcsh
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 779040 from shells

Browse Source 
- Add patch tcsh-6.22.02-history-merge.dif
  * Was mentioned in upstream mailing list 
- Change patch tcsh-6.22.02-local-dotlock.dif
  * Use fcntl() with F_SETLKW for locking the dot lock file its self
    as this works mostly over NFS whereas tmpfs is local only

OBS-URL: https://build.opensuse.org/request/show/779040
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tcsh?expand=0&rev=71
This commit is contained in:
Dominique Leuenberger 2020-02-29 20:18:49 +00:00 committed by Git OBS Bridge
commit 1d5a5a4f59
4 changed files with 219 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tcsh-6.22.02-history-merge.dif Normal file
View File

@ -0,0 +1,20 @@
Subject: [Tcsh] tcsh 6.22.00 does not merge history (was: Re: tcsh Deadlock with SIGHUP)
Message-ID: <20200223205556.GA2917@panix.com>
References: <20200120140836.GA3123@panix.com>
<D3B9BAFA-5D5C-4023-B7E3-06D1CA429777@zoulas.com>
---
sh.hist.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- sh.hist.c
+++ sh.hist.c 2020-02-24 12:21:37.003639844 +0000
@@ -1295,7 +1295,7 @@ rechist(Char *fname, int ref)
#endif
}
getexit(osetexit);
- if (setexit())
+ if (!setexit())
loadhist(fname, 1);
resexit(osetexit);
}

251
tcsh-6.22.02-local-dotlock.dif
View File

@ -1,82 +1,203 @@
Avoid left over dot lock file after reboot Avoid left over dot lock file after reboot
--- ---
dotlock.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ dotlock.c | 124 ++++++++++++++------------------------------------------------
1 file changed, 50 insertions(+) dotlock.h | 2 -
sh.hist.c | 11 +++--
3 files changed, 36 insertions(+), 101 deletions(-)
--- dotlock.c --- dotlock.c
+++ dotlock.c 2020-02-17 11:16:22.785018224 +0000 +++ dotlock.c 2020-02-19 12:07:22.228255145 +0000
@@ -30,8 +30,38 @@ @@ -29,7 +29,9 @@
#ifndef O_SYNC
#define O_SYNC 0 #define O_SYNC 0
#endif #endif
-
+#if defined(__linux__)
+# include <sys/statfs.h>
+#include <unistd.h> +#include <unistd.h>
+# ifndef TMPFS_MAGIC +#include <fcntl.h>
+# define TMPFS_MAGIC 0x01021994
+# endif
+#endif
+ +
#include "dotlock.h" #include "dotlock.h"
+#if defined(__linux__)
+static char *sys_tmpdir;
+static int
+dosys_tmpdir ()
+{
+ static char *shm = "/dev/shm";
+ struct statfs fs;
+ static int doshm;
+
+ if (doshm)
+ return (sys_tmpdir != NULL);
+
+ doshm++;
+
+ if (statfs(shm, &fs) < 0 || fs.f_type != TMPFS_MAGIC || eaccess(shm, W_OK|X_OK))
+ return 0;
+
+ sys_tmpdir = shm;
+ return 1;
+}
+#endif
+
static int create_exclusive(const char *); static int create_exclusive(const char *);
/* @@ -46,77 +48,26 @@ static int create_exclusive(const char *
* Create a unique file. O_EXCL does not really work over NFS so we follow static int
@@ -140,7 +170,17 @@ dot_lock(const char *fname, int pollinte create_exclusive(const char *fname)
(void)sigaddset(&nset, SIGTSTP); {
(void)sigaddset(&nset, SIGCHLD); - char path[MAXPATHLEN], hostname[MAXHOSTNAMELEN + 1];
- const char *ptr;
- struct timeval tv;
- pid_t pid;
- size_t ntries, cookie;
- int fd, serrno;
- struct stat st;
-
- (void)gettimeofday(&tv, NULL);
- (void)gethostname(hostname, sizeof(hostname));
- hostname[sizeof(hostname) - 1] = '\0';
- pid = getpid();
-
- cookie = pid ^ tv.tv_usec;
-
- /*
- * We generate a semi-unique filename, from hostname.(pid ^ usec)
- */
- if ((ptr = strrchr(fname, '/')) == NULL)
- ptr = fname;
- else
- ptr++;
-
- (void)snprintf(path, sizeof(path), "%.*s.%s.%lx",
- (int)(ptr - fname), fname, hostname, (u_long)cookie);
-
- /*
- * We try to create the unique filename.
- */
- for (ntries = 0; ntries < 5; ntries++) {
- fd = open(path, O_WRONLY|O_CREAT|O_TRUNC|O_EXCL|O_SYNC, 0);
- if (fd != -1) {
- (void)close(fd);
+ struct flock fl = { F_WRLCK, SEEK_SET, 0, 0, getpid()};
+ int fd, retval;
+
+ fd = open(fname, O_WRONLY|O_CREAT|O_SYNC, S_IWUSR);
+ if (fd < 0)
+ return -1;
+ do {
+ int ret;
+ retval = fcntl(fd, F_SETLKW, &fl);
+ if (retval < 0) {
+ if (errno == EINTR)
+ continue;
+ close(fd);
+ fd = -1;
break;
}
- else if (errno == EEXIST)
- continue;
- else
- return -1;
- }
-
- /*
- * We link the path to the name
- */
- if (link(path, fname) == -1)
- goto bad;
-
- /*
- * Note that we stat our own exclusively created name, not the
- * destination, since the destination can be affected by others.
- */
- if (stat(path, &st) == -1)
- goto bad;
-
- (void)unlink(path);
-
- /*
- * If the number of links was two (one for the unique file and one
- * for the lock), we've won the race
- */
- if (st.st_nlink != 2) {
- errno = EEXIST;
- return -1;
- }
- return 0;
+ } while (retval < 0);
+#if defined(__linux__) -bad:
+ const char *ptr; - serrno = errno;
+ if ((ptr = strrchr(fname, '/')) && dosys_tmpdir()) { - (void)unlink(path);
+ ptr++; - errno = serrno;
+ fname = ptr; - return -1;
+ (void)snprintf(path, sizeof(path), "%s/%s.lock", sys_tmpdir, fname); + (void)unlink(fname);
+ } else + return fd;
+ (void)snprintf(path, sizeof(path), "%s.lock", fname); }
+#else
/*
@@ -143,37 +94,18 @@ dot_lock(const char *fname, int pollinte
(void)snprintf(path, sizeof(path), "%s.lock", fname); (void)snprintf(path, sizeof(path), "%s.lock", fname);
+#endif
retval = -1; retval = -1;
for (;;) { - for (;;) {
@@ -174,6 +214,16 @@ dot_unlock(const char *fname) - handle_pending_signals();
{ - (void)sigprocmask(SIG_BLOCK, &nset, &oset);
char path[MAXPATHLEN]; - if (create_exclusive(path) != -1) {
- (void)sigprocmask(SIG_SETMASK, &oset, NULL);
+#if defined(__linux__) - retval = 0;
+ const char *ptr; - break;
+ if ((ptr = strrchr(fname, '/')) && dosys_tmpdir()) { - }
+ ptr++; - else
+ fname = ptr; - (void)sigprocmask(SIG_SETMASK, &oset, NULL);
+ (void)snprintf(path, sizeof(path), "%s/%s.lock", sys_tmpdir, fname); -
+ } else - if (errno != EEXIST)
+ (void)snprintf(path, sizeof(path), "%s.lock", fname); - break;
+#else -
(void)snprintf(path, sizeof(path), "%s.lock", fname); - if (pollinterval) {
+#endif - if (pollinterval == -1) {
(void)unlink(path); - errno = EEXIST;
- break;
- }
- (void)usleep((unsigned int)pollinterval * 1000);
- }
- }
+ handle_pending_signals();
+ (void)sigprocmask(SIG_BLOCK, &nset, &oset);
+ retval = create_exclusive(path);
+ (void)sigprocmask(SIG_SETMASK, &oset, NULL);
handle_pending_signals();
return retval;
} }
void
-dot_unlock(const char *fname)
+dot_unlock(const int fd)
{
- char path[MAXPATHLEN];
-
- (void)snprintf(path, sizeof(path), "%s.lock", fname);
- (void)unlink(path);
+ struct flock fl = { F_UNLCK, SEEK_SET, 0, 0, getpid()};
+ fcntl(fd, F_SETLK, &fl);
+ close(fd);
}
--- dotlock.h
+++ dotlock.h 2020-02-19 09:40:16.034422159 +0000
@@ -30,6 +30,6 @@
* pollinterval -- Interval (miliseconds) to check for lock, -1 return
*/
int dot_lock(const char *fname, int pollinterval);
-void dot_unlock(const char *fname);
+void dot_unlock(const int fd);
#endif /* #ifndef _DOTLOCK_H_ */
--- sh.hist.c
+++ sh.hist.c 2020-02-19 09:48:57.640589111 +0000
@@ -1209,9 +1209,11 @@ fmthist(int fmt, ptr_t ptr)
}
static void
-dotlock_cleanup(void* lockpath)
+dotlock_cleanup(void* xfdp)
{
- dot_unlock((char*)lockpath);
+ int *fdp;
+ fdp = xfdp;
+ dot_unlock(*fdp);
}
/* Save history before exiting the shell. */
@@ -1284,11 +1286,12 @@ rechist(Char *fname, int ref)
jmp_buf_t osetexit;
if (lock) {
#ifndef WINNT_NATIVE
+ int fdlk;
char *lockpath = strsave(short2str(fname));
cleanup_push(lockpath, xfree);
/* Poll in 100 miliseconds interval to obtain the lock. */
- if ((dot_lock(lockpath, 100) == 0))
- cleanup_push(lockpath, dotlock_cleanup);
+ if ((fdlk = dot_lock(lockpath, 100)) != -1)
+ cleanup_push(&fdlk, dotlock_cleanup);
#endif
}
getexit(osetexit);

9
tcsh.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Feb 24 12:25:05 UTC 2020 - Dr. Werner Fink <werner@suse.de>
- Add patch tcsh-6.22.02-history-merge.dif
* Was mentioned in upstream mailing list
- Change patch tcsh-6.22.02-local-dotlock.dif
* Use fcntl() with F_SETLKW for locking the dot lock file its self
as this works mostly over NFS whereas tmpfs is local only
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 17 11:19:42 UTC 2020 - Dr. Werner Fink <werner@suse.de> Mon Feb 17 11:19:42 UTC 2020 - Dr. Werner Fink <werner@suse.de>

2
tcsh.spec
View File

@ -34,6 +34,7 @@ Patch5: tcsh-6.17.06-dspmbyte.dif
Patch6: tcsh-6.18.03-catalogs.dif Patch6: tcsh-6.18.03-catalogs.dif
Patch7: tcsh-6.22.02-workaround-common.patch Patch7: tcsh-6.22.02-workaround-common.patch
Patch8: tcsh-6.22.02-local-dotlock.dif Patch8: tcsh-6.22.02-local-dotlock.dif
Patch9: tcsh-6.22.02-history-merge.dif
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
@ -61,6 +62,7 @@ correction, a history mechanism, job control, and a C-like syntax.
%patch6 -b .catalogs %patch6 -b .catalogs
%patch7 -p 1 -b .workaround %patch7 -p 1 -b .workaround
%patch8 -p 0 -b .dotlock %patch8 -p 0 -b .dotlock
%patch9 -p 0 -b .histmrg
%patch0 -b .0 %patch0 -b .0
%build %build