summaryrefslogtreecommitdiff
path: root/textproc/ispell/files/patch-ispell.c
diff options
context:
space:
mode:
authorJean-Marc Zucconi <jmz@FreeBSD.org>2008-07-21 11:54:12 +0000
committerJean-Marc Zucconi <jmz@FreeBSD.org>2008-07-21 11:54:12 +0000
commit590818478446e601f04b61fc883b670577966a5c (patch)
treeea1a513949245ef25ba2535beda95f77664c84e5 /textproc/ispell/files/patch-ispell.c
parent- Roll back the last patch removed by mistake and remove the correct patch. (diff)
Update to version 3.3.02.
Update the URL for the italian dictionary. PR: ports/125267: Submitted by: "Pedro F. Giffuni" <pfgshield-freebsd@yahoo.com>
Diffstat (limited to 'textproc/ispell/files/patch-ispell.c')
-rw-r--r--textproc/ispell/files/patch-ispell.c56
1 files changed, 34 insertions, 22 deletions
diff --git a/textproc/ispell/files/patch-ispell.c b/textproc/ispell/files/patch-ispell.c
index 54f5ce596c28..1cdc4acee131 100644
--- a/textproc/ispell/files/patch-ispell.c
+++ b/textproc/ispell/files/patch-ispell.c
@@ -1,22 +1,22 @@
---- ispell.c.orig Thu Jul 26 07:51:46 2001
-+++ ispell.c Sat Dec 17 22:21:26 2005
-@@ -209,6 +209,7 @@
+--- ispell.c.orig 2005-05-25 09:13:53.000000000 -0500
++++ ispell.c 2008-07-04 12:12:02.000000000 -0500
+@@ -235,6 +235,7 @@
#include <fcntl.h>
#endif /* NO_FCNTL_H */
#include <sys/stat.h>
+#include <libgen.h>
static void usage P ((void));
- static void initckch P ((char * wchars));
-@@ -327,6 +328,7 @@
+ int main P ((int argc, char * argv[]));
+@@ -272,6 +273,7 @@
char ** versionp;
char * wchars = NULL;
char * preftype = NULL;
+ char * cmdname;
static char libdictname[sizeof DEFHASH];
+ char logfilename[MAXPATHLEN];
static char outbuf[BUFSIZ];
- int argno;
-@@ -334,6 +336,11 @@
+@@ -280,6 +282,11 @@
Cmd = *argv;
@@ -27,8 +27,8 @@
+
Trynum = 0;
- p = getenv ("DICTIONARY");
-@@ -792,6 +799,11 @@
+ p = getenv (LIBRARYVAR);
+@@ -851,6 +858,11 @@
LibDict = p + 1;
}
break;
@@ -40,7 +40,7 @@
case 'V': /* Display 8-bit characters as M-xxx */
if (arglen > 2)
usage ();
-@@ -827,7 +839,7 @@
+@@ -886,7 +898,7 @@
argc--;
}
@@ -49,8 +49,8 @@
{
if (argc != 0)
usage ();
-@@ -848,7 +860,7 @@
- if (access (argv[argno], 4) >= 0)
+@@ -907,7 +919,7 @@
+ if (access (argv[argno], R_OK) >= 0)
break;
}
- if (argno >= argc && !lflag && !aflag && !eflag && !dumpflag)
@@ -58,18 +58,28 @@
{
(void) fprintf (stderr,
argc == 1 ? ISPELL_C_NO_FILE : ISPELL_C_NO_FILES);
-@@ -935,6 +947,35 @@
- outfile = stdout;
- checkfile ();
+@@ -988,9 +1000,9 @@
exit (0);
-+ }
-+
+ }
+
+-#ifndef __bsdi__
++#ifndef BSD_4_4
+ setbuf (stdout, outbuf);
+-#endif /* __bsdi__ */
++#endif /* BSD_4_4 */
+ if (lflag)
+ {
+ infile = setupdefmt(NULL, NULL);
+@@ -999,6 +1011,35 @@
+ exit (0);
+ }
+
+ if (uflag)
+ {
+ lflag++;
+ if (!argc)
+ {
-+ infile = setupdefmt(NULL);
++ infile = setupdefmt(NULL, NULL);
+ outfile = stdout;
+ checkfile ();
+ exit (0);
@@ -78,7 +88,7 @@
+ {
+ while (argc--)
+ {
-+ if ((infile = setupdefmt (*argv)) == NULL)
++ if ((infile = setupdefmt (*argv, NULL)) == NULL)
+ {
+ (void) fprintf (stderr, CANT_OPEN, *argv);
+ (void) sleep ((unsigned) 2);
@@ -91,6 +101,8 @@
+ }
+ exit (0);
+ }
- }
-
- terminit ();
++ }
++
+ /*
+ * If there is a log directory, open a log file. If the open
+ * fails, we just won't log.