101 lines
2.4 KiB
Text
101 lines
2.4 KiB
Text
--- b.c.orig Fri Jan 20 02:38:25 1995
|
|
+++ b.c Sun Feb 10 14:39:03 2002
|
|
@@ -21,6 +21,9 @@
|
|
#include <pwd.h>
|
|
#endif
|
|
#include <errno.h>
|
|
+#include <sys/file.h>
|
|
+#include <sys/types.h>
|
|
+#include <sys/stat.h>
|
|
|
|
#include "config.h"
|
|
#include "blocks.h"
|
|
@@ -201,6 +204,7 @@
|
|
if(prop) b->o=prop->o;
|
|
else b->o=pdefault;
|
|
mset(b->marks,0,sizeof(b->marks));
|
|
+ b->filehandle = -1; /* initialize filehandle &&& ob */
|
|
b->rdonly=0;
|
|
b->orphan=0;
|
|
b->oldcur=0;
|
|
@@ -255,6 +259,10 @@
|
|
{
|
|
if(b && !--b->count)
|
|
{
|
|
+ if (b->filehandle != -1) {
|
|
+ /* close filehandle, free lock &&& ob */
|
|
+ close (b->filehandle);
|
|
+ }
|
|
if(b->changed) abrerr(b->name);
|
|
if(b==errbuf) errbuf=0;
|
|
if(b->undo) undorm(b->undo);
|
|
@@ -1671,7 +1679,8 @@
|
|
B *b;
|
|
long skip,amnt;
|
|
char *n;
|
|
- int nowrite=0;
|
|
+ struct stat sb;
|
|
+ int nowrite=0,fh=-1;
|
|
|
|
if(!s || !s[0])
|
|
{
|
|
@@ -1704,6 +1713,28 @@
|
|
else fclose(fi);
|
|
fi=fopen(n,"r");
|
|
if(!fi) nowrite=0;
|
|
+/*printf ("nowrite open=%i\n", nowrite); */
|
|
+
|
|
+ /* check file mod, if no write flags set,
|
|
+ joe in read only mode. &&& ob */
|
|
+
|
|
+ if (!nowrite) {
|
|
+ nowrite = (!stat (n, &sb)) && (!(sb.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH)));
|
|
+ }
|
|
+/*printf ("nowrite stat=%i\n", nowrite); */
|
|
+
|
|
+ /* lock the file if writable, or go into read only mode if
|
|
+ already locked, */
|
|
+
|
|
+ if ((fi) && (!nowrite)) {
|
|
+ fh = dup( fileno(fi) );
|
|
+ nowrite = (flock (fh, LOCK_EX | LOCK_NB));
|
|
+ }
|
|
+/*printf ("nowrite flock=%i\n", nowrite); */
|
|
+
|
|
+/*nowrite = 1; */ /* for test purpose */
|
|
+/*printf ("nowrite=%i\n", nowrite); */
|
|
+
|
|
}
|
|
joesep(n);
|
|
|
|
@@ -1761,6 +1792,7 @@
|
|
vsrm(n);
|
|
|
|
b->er=error;
|
|
+ if( fh != -1 ) b->filehandle = fh;
|
|
return b;
|
|
}
|
|
|
|
@@ -1988,9 +2020,20 @@
|
|
|
|
void ttsig(sig)
|
|
{
|
|
- long tim=time(0);
|
|
+ time_t tim=time(0);
|
|
B *b;
|
|
- FILE *f=fopen("DEADJOE","a");
|
|
+ FILE *f;
|
|
+ struct stat sb;
|
|
+ if ((lstat("DEADJOE", &sb) == 0) && (((sb.st_mode & S_IFLNK) && (sb.st_uid != getuid())) || (sb.st_nlink > 1)))
|
|
+ {
|
|
+ printf("*** JOE was aborted ");
|
|
+ if (sig) printf("by signal %d, cannot save DEADJOE due to unsafe symlink\n",sig);
|
|
+ else printf("because the terminal closed, cannot save DEADJOE due to unsafe symlink\n");
|
|
+ if(sig) ttclsn();
|
|
+ _exit(1);
|
|
+ }
|
|
+ f=fopen("DEADJOE","a");
|
|
+ chmod("DEADJOE", S_IRUSR | S_IWUSR);
|
|
fprintf(f,"\n*** Modified files in JOE when it aborted on %s",ctime(&tim));
|
|
if(sig) fprintf(f,"*** JOE was aborted by signal %d\n",sig);
|
|
else fprintf(f,"*** JOE was aborted because the terminal closed\n");
|