diff options
| author | cjep <cjep@pkgsrc.org> | 2003-04-27 17:45:30 +0000 |
|---|---|---|
| committer | cjep <cjep@pkgsrc.org> | 2003-04-27 17:45:30 +0000 |
| commit | 138ce904f2dce57d393001485714d21dc05cc15f (patch) | |
| tree | 1e9457932138a99bbf2556706bacba7ea50577d7 /editors/joe/patches/patch-af | |
| parent | 9fd04dd30477de6256172b01a905a3e4e7bc1d3f (diff) | |
| download | pkgsrc-138ce904f2dce57d393001485714d21dc05cc15f.tar.gz | |
Use time_t rather than guess int or long. Fixes build on NetBSD/shark
et al.
Diffstat (limited to 'editors/joe/patches/patch-af')
| -rw-r--r-- | editors/joe/patches/patch-af | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/editors/joe/patches/patch-af b/editors/joe/patches/patch-af index a463cf9a903..54a81621f16 100644 --- a/editors/joe/patches/patch-af +++ b/editors/joe/patches/patch-af @@ -1,24 +1,16 @@ -$NetBSD: patch-af,v 1.1 2001/05/22 11:37:17 wiz Exp $ +$NetBSD: patch-af,v 1.2 2003/04/27 17:45:31 cjep Exp $ ---- ufile.c.orig Fri Jan 13 18:13:16 1995 -+++ ufile.c -@@ -135,7 +135,7 @@ - int cp(from,to) - char *from, *to; - { -- int f, g, amnt; -+ int f, g, amnt, rc; - struct stat sbuf; - - #ifdef HAVEUTIME -@@ -157,8 +157,8 @@ +--- termcap.c.orig 1995-01-23 09:07:10.000000000 +0000 ++++ termcap.c +@@ -191,7 +191,11 @@ else + namebuf=0; + namebuf=vsncpy(sv(namebuf),sc(".termcap ")); + namebuf=vsncpy(sv(namebuf),sc(JOERC)); ++#ifdef __NetBSD__ ++ namebuf=vsncpy(sv(namebuf),sc("termcap /usr/share/misc/termcap")); ++#else + namebuf=vsncpy(sv(namebuf),sc("termcap /etc/termcap")); ++#endif } - while((amnt=read(f,stdbuf,stdsiz))>0) - if(amnt!=write(g,stdbuf,amnt)) break; -- close(f); close(g); -- if(amnt) return -1; -+ close(f); rc = close(g); -+ if(amnt || rc) return -1; + } - #ifdef HAVEUTIME - #ifdef NeXT |