cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a patch to fix a problem that ~/.fd_history is truncated

Browse Source 
when the home directory is on a file system without locking support.
This commit is contained in:
Akinori MUSHA 2006-04-11 08:12:00 +00:00
parent 2fa9c7d3ff
commit 36b30af69f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=159313
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
shells/fd/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= fd
PORTVERSION= 2.08b
PORTREVISION= 1
CATEGORIES= shells
MASTER_SITES= http://hp.vector.co.jp/authors/VA012337/soft/fd/ \
ftp://ftp.unixusers.net/src/fdclone/

47
shells/fd/files/patch-shell.c Normal file
View File

@ -0,0 +1,47 @@
cf. [FDclone-users:00493]
diff -u ../old/FD-2.08b/shell.c ./shell.c
--- ../old/FD-2.08b/shell.c Thu Mar 30 00:00:00 2006
+++ ./shell.c Mon Apr 10 22:45:35 2006
@@ -1630,12 +1630,7 @@
int i, j, size;
if (!file || !(fp = Xfopen(file, "r"))) return(-1);
-#ifndef NOFLOCK
- if (lockfile(Xfileno(fp), LCK_READ) < 0) {
- Xfclose(fp);
- return(-1);
- }
-#endif
+ VOID_C lockfile(Xfileno(fp), LCK_READ);
size = (int)histsize[n];
history[n] = (char **)malloc2(sizeof(char *) * (size + 1));
@@ -1650,7 +1645,7 @@
for (j = i; j > 0; j--) history[n][j] = history[n][j - 1];
history[n][0] = line;
}
- lockfile(Xfileno(fp), LCK_UNLOCK);
+ VOID_C lockfile(Xfileno(fp), LCK_UNLOCK);
Xfclose(fp);
for (i++; i <= size; i++) history[n][i] = NULL;
@@ -1684,16 +1679,11 @@
if (!history[n] || !history[n][0]) return(-1);
if (!file || !(fp = Xfopen(file, "w"))) return(-1);
-#ifndef NOFLOCK
- if (lockfile(Xfileno(fp), LCK_WRITE) < 0) {
- Xfclose(fp);
- return(-1);
- }
-#endif
+ VOID_C lockfile(Xfileno(fp), LCK_WRITE);
size = (savehist > (int)histsize[n]) ? (int)histsize[n] : savehist;
for (i = size - 1; i >= 0; i--) convhistory(history[n][i], fp);
- lockfile(Xfileno(fp), LCK_UNLOCK);
+ VOID_C lockfile(Xfileno(fp), LCK_UNLOCK);
Xfclose(fp);
return(0);