OpenXM_contrib2/fep/fep+NetBSD-OpenXM.diff - diff

Return to fep+NetBSD-OpenXM.diff CVS log

Up to [local] / OpenXM_contrib2 / fep

Diff for /OpenXM_contrib2/fep/fep+NetBSD-OpenXM.diff between version 1.1 and 1.2

version 1.1, 2002/09/03 00:41:43

version 1.2, 2002/09/18 10:03:27

Line 1

diff -cr official+NetBSD/Makefile fep-cygwin/Makefile

diff -cr fep.orig/Makefile fep/Makefile

*** official+NetBSD/Makefile Mon Sep 2 15:54:20 2002

*** fep.orig/Makefile Wed Sep 18 18:48:24 2002

--- fep-cygwin/Makefile Mon Sep 2 18:37:26 2002

--- fep/Makefile Tue Sep 3 09:41:43 2002

***************

*** 25,35 ****

#DEBUG = -O

Line 15 diff -cr official+NetBSD/Makefile fep-cygwin/Makefile

all: $(TARGET)

--- 25,31 ----

diff -cr official+NetBSD/fep_alias.c fep-cygwin/fep_alias.c

Only in fep: fep

*** official+NetBSD/fep_alias.c Mon Sep 2 15:54:20 2002

Only in fep: fep+NetBSD-OpenXM.diff

--- fep-cygwin/fep_alias.c Mon Sep 2 19:01:17 2002

diff -cr fep.orig/fep_alias.c fep/fep_alias.c

*** fep.orig/fep_alias.c Wed Sep 18 18:48:25 2002

--- fep/fep_alias.c Tue Sep 3 09:41:44 2002

***************

*** 3,9 ****

#ifndef lint

Line 35 diff -cr official+NetBSD/fep_alias.c fep-cygwin/fep_al

Line 37 diff -cr official+NetBSD/fep_alias.c fep-cygwin/fep_al

#include <stdio.h>

#include <ctype.h>

diff -cr official+NetBSD/fep_com.c fep-cygwin/fep_com.c

Only in fep: fep_alias.o

*** official+NetBSD/fep_com.c Mon Sep 2 15:54:20 2002

diff -cr fep.orig/fep_com.c fep/fep_com.c

--- fep-cygwin/fep_com.c Mon Sep 2 19:01:25 2002

*** fep.orig/fep_com.c Wed Sep 18 18:48:26 2002

--- fep/fep_com.c Wed Sep 18 18:44:20 2002

***************

*** 3,15 ****

#ifndef lint

Line 67 diff -cr official+NetBSD/fep_com.c fep-cygwin/fep_com.

Line 70 diff -cr official+NetBSD/fep_com.c fep-cygwin/fep_com.

#ifndef _POSIX_VDISABLE

#define _POSIX_VDISABLE '\0'

#endif

diff -cr official+NetBSD/fep_defs.h fep-cygwin/fep_defs.h

*** official+NetBSD/fep_defs.h Mon Sep 2 15:54:20 2002

--- fep-cygwin/fep_defs.h Mon Sep 2 19:04:53 2002

***************

*** 22,27 ****

--- 22,30 ----

#include <sys/file.h>

#include <sys/stat.h>

#include <sys/ioctl.h>

+ #if defined(sun)

+ #include <sys/fcntl.h>

+ #endif

#include "fep_defs.h"

#include "fep_glob.h"

#include "fep_funcs.h"

Only in fep: fep_com.o

diff -cr fep.orig/fep_defs.h fep/fep_defs.h

*** fep.orig/fep_defs.h Wed Sep 18 18:48:27 2002

--- fep/fep_defs.h Tue Sep 3 09:41:44 2002

***************

*** 3,9 ****

#ifndef lint

# define FEP_DEFS \

Line 176 diff -cr official+NetBSD/fep_defs.h fep-cygwin/fep_def

Line 192 diff -cr official+NetBSD/fep_defs.h fep-cygwin/fep_def

* Typedef's

diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edit.c

diff -cr fep.orig/fep_edit.c fep/fep_edit.c

*** official+NetBSD/fep_edit.c Mon Sep 2 15:54:20 2002

*** fep.orig/fep_edit.c Wed Sep 18 18:48:28 2002

--- fep-cygwin/fep_edit.c Mon Sep 2 19:07:54 2002

--- fep/fep_edit.c Wed Sep 18 18:43:52 2002

***************

*** 3,9 ****

#ifndef lint

Line 215 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

Line 231 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

#endif

***************

*** 21,27 ****

--- 21,32 ----

--- 21,36 ----

#endif

#include <sys/time.h>

#include <ctype.h>

+ #if defined(__CYGWIN__)

+ #include <sys/dirent.h>

+ #define direct dirent

+ #elif defined(sun)

+ #include <dirent.h>

+ #define direct dirent

+ #include <unistd.h>

+ #else

#include <sys/dir.h>

+ #endif

Line 230 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

Line 250 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

#include "fep_defs.h"

***************

*** 207,213 ****

--- 212,225 ----

--- 216,229 ----

import (cft, initial_ttymode.c_cc[VSTART], ignore);

import (cft, initial_ttymode.c_cc[VSTOP], ignore);

Line 247 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

Line 267 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

import (cft, initial_ttymode.c_cc[VEOF], send_eof);

***************

*** 230,236 ****

--- 242,253 ----

--- 246,257 ----

import (cft, tchars_buf.t_startc, ignore);

import (cft, tchars_buf.t_stopc, ignore);

Line 269 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

Line 289 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

currentNull = strlen (CommandLine);

--- 478,484 ----

--- 482,488 ----

#ifdef KANJI

CHAR byte2;

Line 286 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

Line 306 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

putChar (c);

reverse_strcpy (

&CommandLine[CurrentPosition] + nbyte,

--- 497,503 ----

--- 501,507 ----

nbyte = 2;

}

else

Line 303 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

Line 323 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

printS (&CommandLine [CurrentPosition]);

if (CommandLine[CurrentPosition] != '\0') {

--- 509,515 ----

--- 513,519 ----

if (nbyte > 1) {

CommandLine[CurrentPosition - 1] = byte2;

}

Line 320 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

Line 340 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

)

(void) forward_n_character (1);

}

--- 613,619 ----

--- 617,623 ----

#ifdef KANJI

&& !(CurrentPosition + 1 == position

&& iskanji (CommandLine[CurrentPosition]))

Line 340 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

Line 360 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

* Move cursor to end of line

--- 637,646 ----

--- 641,650 ----

#ifdef KANJI

#define INC(i) if(iskanji(CommandLine[i])) i+=2; else i++;

#define DEC(i) if(i>=2 && iskanji_in_string(CommandLine, i-2)) i-=2; else i--;

Line 360 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

Line 380 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

putchar (BS);

i--;

}

--- 698,704 ----

--- 702,708 ----

i--;

}

else

Line 377 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

Line 397 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

while (n--) {

i--, nchars++;

while (i > 0 && !iswordchar (CommandLine [i])) {

--- 753,759 ----

--- 757,763 ----

nchars++;

}

Line 394 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

Line 414 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

return (backward_n_character (nchars));

}

--- 763,769 ----

--- 767,773 ----

i--, nchars++;

}

Line 411 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

Line 431 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

while (n--) {

i--, nchars++;

while (i > 0 && !isWordchar (CommandLine [i]))

--- 814,820 ----

--- 818,824 ----

nchars++;

}

Line 428 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

Line 448 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

return (backward_n_character (nchars));

}

--- 822,828 ----

--- 826,832 ----

while (i > 0 && isWordchar (CommandLine [i - 1]))

i--, nchars++;

}

Line 445 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

Line 465 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

if (isctlchar(CommandLine[i])) {

(void) putchar (unctl (CommandLine [i]));

i++;

--- 860,866 ----

--- 864,870 ----

(void) putchar (CommandLine[i++]);

}

else

Line 462 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

Line 482 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

putChar (CommandLine [i++]);

}

--- 875,881 ----

--- 879,885 ----

(void) putchar (CommandLine[i++]);

}

else

Line 481 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

Line 501 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

deleteArea = howlong (&CommandLine[CurrentPosition - nbyte], nbyte);

restArea = howlong (&CommandLine[CurrentPosition], 0);

--- 1056,1064 ----

--- 1060,1068 ----

i -= 2, nbyte += 2;

else

i -= 1, nbyte += 1;

Line 500 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

Line 520 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

while (n--) {

i--, nchars++;

while (i > 0 && !iswordchar (CommandLine [i]))

--- 1131,1137 ----

--- 1135,1141 ----

nchars++;

}

Line 517 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

Line 537 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

return (delete_previous_n_character (nchars));

}

--- 1139,1145 ----

--- 1143,1149 ----

while (i > 0 && iswordchar (CommandLine [i - 1]))

i--, nchars++;

}

Line 534 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

Line 554 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

while (n--) {

i--, nchars++;

while (i > 0 && !isWordchar (CommandLine [i]))

--- 1192,1198 ----

--- 1196,1202 ----

nchars++;

}

Line 551 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

Line 571 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

return (delete_previous_n_character (nchars));

}

--- 1200,1206 ----

--- 1204,1210 ----

while (i > 0 && isWordchar (CommandLine [i - 1]))

i--, nchars++;

}

Line 570 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

Line 590 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

deleteArea = howlong (&CommandLine[CurrentPosition], nbyte);

restArea = howlong (&CommandLine[CurrentPosition + nbyte], 0);

--- 1239,1247 ----

--- 1243,1251 ----

else

cp++, nbyte++;

}

Line 591 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

Line 611 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

if (fcp == 0) {

fputs ("\r\n", stdout);

perror ("alloca:");

--- 1798,1806 ----

--- 1802,1810 ----

# ifdef ALLOCA

fcp = (char *) alloca (strlen (dp->d_name) + 1);

Line 610 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

Line 630 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

closedir(dirp);

return (0);

--- 1861,1867 ----

--- 1865,1871 ----

# ifndef ALLOCA

for (i = 0; fileList [i]; i++)

free (fileList [i]);

Line 629 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

Line 649 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

if (fcp == 0) {

fputs ("\r\n", stdout);

perror ("alloca:");

--- 1989,1997 ----

--- 1993,2001 ----

if (prefix (prefixstring, dp->d_name)) {

# ifdef ALLOCA

fcp = (char *) alloca (strlen (dp->d_name) + 1);

Line 648 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

Line 668 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

return;

}

--- 2035,2041 ----

--- 2039,2045 ----

# ifndef ALLOCA

for (i = 0; fileList [i]; i++)

free (fileList [i]);

Line 665 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

Line 685 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

bind_key (ft, func, s, dfunc)

FUNC ft[]; /* Function table */

--- 2082,2088 ----

--- 2086,2092 ----

fputs ("\n", stdout);

}

Line 673 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

Line 693 diff -cr official+NetBSD/fep_edit.c fep-cygwin/fep_edi

bind_key (ft, func, s, dfunc)

FUNC ft[]; /* Function table */

diff -cr official+NetBSD/fep_funcs.c fep-cygwin/fep_funcs.c

Only in fep: fep_edit.o

*** official+NetBSD/fep_funcs.c Mon Sep 2 15:54:20 2002

diff -cr fep.orig/fep_funcs.c fep/fep_funcs.c

--- fep-cygwin/fep_funcs.c Mon Sep 2 19:03:26 2002

*** fep.orig/fep_funcs.c Wed Sep 18 18:48:28 2002

--- fep/fep_funcs.c Tue Sep 3 09:41:44 2002

***************

*** 3,9 ****

#ifndef lint

Line 693 diff -cr official+NetBSD/fep_funcs.c fep-cygwin/fep_fu

Line 714 diff -cr official+NetBSD/fep_funcs.c fep-cygwin/fep_fu

#include <stdio.h>

#include "fep_defs.h"

diff -cr official+NetBSD/fep_funcs.h fep-cygwin/fep_funcs.h

diff -cr fep.orig/fep_funcs.h fep/fep_funcs.h

*** official+NetBSD/fep_funcs.h Mon Sep 2 15:54:20 2002

*** fep.orig/fep_funcs.h Wed Sep 18 18:48:29 2002

--- fep-cygwin/fep_funcs.h Mon Sep 2 19:05:03 2002

--- fep/fep_funcs.h Wed Sep 18 18:39:29 2002

***************

*** 3,9 ****

#ifndef lint

Line 719 diff -cr official+NetBSD/fep_funcs.h fep-cygwin/fep_fu

Line 740 diff -cr official+NetBSD/fep_funcs.h fep-cygwin/fep_fu

int delete_previous_word();

int delete_previous_Word();

int delete_to_kill_buffer();

+ #if defined(__CYGWIN__)

+ #if defined(__CYGWIN__) || defined(sun)

+ void terminate(int);

+ #else

void terminate __P((int));

Line 728 diff -cr official+NetBSD/fep_funcs.h fep-cygwin/fep_fu

Line 749 diff -cr official+NetBSD/fep_funcs.h fep-cygwin/fep_fu

int end_of_line();

int expand_file_name();

int forward_character();

diff -cr official+NetBSD/fep_glob.h fep-cygwin/fep_glob.h

Only in fep: fep_funcs.o

*** official+NetBSD/fep_glob.h Mon Sep 2 15:54:20 2002

diff -cr fep.orig/fep_glob.h fep/fep_glob.h

--- fep-cygwin/fep_glob.h Mon Sep 2 19:05:16 2002

*** fep.orig/fep_glob.h Wed Sep 18 18:48:29 2002

--- fep/fep_glob.h Tue Sep 3 09:41:44 2002

***************

*** 3,9 ****

#ifndef lint

Line 748 diff -cr official+NetBSD/fep_glob.h fep-cygwin/fep_glo

Line 770 diff -cr official+NetBSD/fep_glob.h fep-cygwin/fep_glo

extern FUNC *curFuncTab; /* function table */

extern FUNC *altFuncTab; /* altanative function table */

diff -cr official+NetBSD/fep_hist.c fep-cygwin/fep_hist.c

diff -cr fep.orig/fep_hist.c fep/fep_hist.c

*** official+NetBSD/fep_hist.c Mon Sep 2 15:54:20 2002

*** fep.orig/fep_hist.c Wed Sep 18 18:48:30 2002

--- fep-cygwin/fep_hist.c Mon Sep 2 19:03:17 2002

--- fep/fep_hist.c Tue Sep 3 09:41:44 2002

***************

*** 3,9 ****

#ifndef lint

Line 782 diff -cr official+NetBSD/fep_hist.c fep-cygwin/fep_his

Line 804 diff -cr official+NetBSD/fep_hist.c fep-cygwin/fep_his

char **HistoryTable;

int TopOfHist;

diff -cr official+NetBSD/fep_main.c fep-cygwin/fep_main.c

Only in fep: fep_hist.o

*** official+NetBSD/fep_main.c Mon Sep 2 15:54:21 2002

diff -cr fep.orig/fep_main.c fep/fep_main.c

--- fep-cygwin/fep_main.c Mon Sep 2 19:03:54 2002

*** fep.orig/fep_main.c Wed Sep 18 18:48:31 2002

--- fep/fep_main.c Wed Sep 18 18:45:26 2002

***************

*** 3,9 ****

*** 3,18 ****

#ifndef lint

static char rcsid[]=

"$Id$ (SRA)";

Line 794 diff -cr official+NetBSD/fep_main.c fep-cygwin/fep_mai

Line 817 diff -cr official+NetBSD/fep_main.c fep-cygwin/fep_mai

#include <stdio.h>

#include <signal.h>

--- 3,9 ----

#include <sys/types.h>

#include <sys/stat.h>

#include <sys/ioctl.h>

#ifdef TERMIOS

#include <termios.h>

! #ifdef __linux__

#ifndef _POSIX_VDISABLE

#define _POSIX_VDISABLE '\0'

#endif

--- 3,22 ----

#ifndef lint

static char rcsid[]=

"$Id$ (SRA)";

Line 802 diff -cr official+NetBSD/fep_main.c fep-cygwin/fep_mai

Line 834 diff -cr official+NetBSD/fep_main.c fep-cygwin/fep_mai

#include <stdio.h>

#include <signal.h>

***************

#include <sys/types.h>

*** 12,18 ****

#include <sys/stat.h>

#include <sys/ioctl.h>

+ #if defined(sun)

+ #include <sys/fcntl.h>

+ #include <sys/ttold.h>

+ #endif

#ifdef TERMIOS

#include <termios.h>

! #ifdef __linux__

#ifndef _POSIX_VDISABLE

#define _POSIX_VDISABLE '\0'

#endif

--- 12,18 ----

#include <sys/ioctl.h>

#ifdef TERMIOS

#include <termios.h>

! #if defined(__linux__) || defined(__CYGWIN__)

#ifndef _POSIX_VDISABLE

#define _POSIX_VDISABLE '\0'

Line 828 diff -cr official+NetBSD/fep_main.c fep-cygwin/fep_mai

Line 856 diff -cr official+NetBSD/fep_main.c fep-cygwin/fep_mai

char *myself; /* the command name */

char *prompt = ""; /* prompt string */

--- 39,45 ----

--- 43,49 ----

#ifdef STAT

static char fep_statrc[] = FEP_STAT;

#endif

Line 837 diff -cr official+NetBSD/fep_main.c fep-cygwin/fep_mai

Line 865 diff -cr official+NetBSD/fep_main.c fep-cygwin/fep_mai

char *myself; /* the command name */

char *prompt = ""; /* prompt string */

***************

*** 57,63 ****

--- 61,71 ----

int debug = OFF; /* debug switch */

int auto_tty_fix = ON; /* fix tty mode automaticaly */

FILE *script_fp = NULL; /* script file pointer */

+ #if defined(sun)

+ void catchsig (int); /* function take care SIGCHILD */

+ #else

void catchsig __P((int)); /* function take care SIGCHILD */

+ #endif

#ifdef TERMIOS

#define ttystruct termios

***************

*** 72,78 ****

--- 80,90 ----

int columns; /* terminal coulumn size */

char *term_clear; /* terminal clear code */

+ #if defined(sun)

+ void (*sighup)(int), (*sigchld)(int), (*sigtstp)(int);

+ #else

void (*sighup) __P((int)), (*sigchld) __P((int)), (*sigtstp) __P((int));

+ #endif

/* function buffer for signal */

#ifdef TIOCSETN

***************

*** 84,90 ****

#ifdef KANJI

struct jtchars jtchars_buf; /* kanji tty characters */

Line 845 diff -cr official+NetBSD/fep_main.c fep-cygwin/fep_mai

Line 901 diff -cr official+NetBSD/fep_main.c fep-cygwin/fep_mai

char master_tty[16]; /* master tty name */

char slave_tty[16]; /* slave tty name */

--- 84,90 ----

--- 96,102 ----

#ifdef KANJI

struct jtchars jtchars_buf; /* kanji tty characters */

int kmode_buf; /* kanji mode */

Line 854 diff -cr official+NetBSD/fep_main.c fep-cygwin/fep_mai

Line 910 diff -cr official+NetBSD/fep_main.c fep-cygwin/fep_mai

char master_tty[16]; /* master tty name */

char slave_tty[16]; /* slave tty name */

***************

*** 302,307 ****

*** 296,307 ****

--- 302,308 ----

--- 308,324 ----

fix_signal ()

{

#ifdef SIGWINCH

+ #if defined(sun)

+ void sigwinch (int);

+ #else

void sigwinch __P((int));

#endif

+ #endif

sighup = signal (SIGHUP, terminate);

sigchld = signal (SIGCHLD, catchsig);

sigtstp = signal (SIGTSTP, SIG_IGN);

Line 865 diff -cr official+NetBSD/fep_main.c fep-cygwin/fep_mai

Line 931 diff -cr official+NetBSD/fep_main.c fep-cygwin/fep_mai

#endif

***************

*** 685,691 ****

--- 686,694 ----

--- 702,710 ----

t = open ("/dev/tty", 2);

if (t >= 0) {

Line 877 diff -cr official+NetBSD/fep_main.c fep-cygwin/fep_mai

Line 943 diff -cr official+NetBSD/fep_main.c fep-cygwin/fep_mai

***************

*** 818,823 ****

--- 821,833 ----

--- 837,849 ----

exit (0);

}

Line 892 diff -cr official+NetBSD/fep_main.c fep-cygwin/fep_mai

Line 958 diff -cr official+NetBSD/fep_main.c fep-cygwin/fep_mai

{

char c;

***************

*** 828,833 ****

*** 850,856 ****

--- 838,853 ----

master = 1;

return;

}

+ #ifdef __CYGWIN32__

+ for (i = 0; i < 16; i++) {

+ sprintf (master_tty, "/dev/ptmx");

+ master = open (master_tty, O_RDWR);

+ if (master >= 0) {

+ sprintf (slave_tty, "/dev/tty%x",i);

+ goto FOUND;

+ }

+ #else

for (c = 'p'; c <= 's'; c++) {

for (i = 0; i < 16; i++) {

sprintf (master_tty, "/dev/pty%c%x", c, i);

***************

*** 838,844 ****

}

Line 919 diff -cr official+NetBSD/fep_main.c fep-cygwin/fep_mai

Line 966 diff -cr official+NetBSD/fep_main.c fep-cygwin/fep_mai

* Can't get master tty

--- 858,864 ----

--- 876,882 ----

}

Line 928 diff -cr official+NetBSD/fep_main.c fep-cygwin/fep_mai

Line 975 diff -cr official+NetBSD/fep_main.c fep-cygwin/fep_mai

* Can't get master tty

***************

*** 877,883 ****

*** 889,895 ****

# if defined(TIOCKGETC) && defined(TIOCKSETC)

ioctl (0, TIOCKGETC, (char *) &jtchars_buf);

# endif

Line 936 diff -cr official+NetBSD/fep_main.c fep-cygwin/fep_mai

Line 983 diff -cr official+NetBSD/fep_main.c fep-cygwin/fep_mai

FD_ZERO(&stdinmask);

FD_ZERO(&mastermask);

--- 897,903 ----

--- 915,921 ----

# if defined(TIOCKGETC) && defined(TIOCKSETC)

ioctl (0, TIOCKGETC, (char *) &jtchars_buf);

# endif

Line 945 diff -cr official+NetBSD/fep_main.c fep-cygwin/fep_mai

Line 992 diff -cr official+NetBSD/fep_main.c fep-cygwin/fep_mai

FD_ZERO(&stdinmask);

FD_ZERO(&mastermask);

***************

*** 916,922 ****

*** 928,934 ****

# if defined(TIOCKGETC) && defined(TIOCKSETC)

ioctl (slave, TIOCKSETC, (char *) &jtchars_buf);

# endif

Line 953 diff -cr official+NetBSD/fep_main.c fep-cygwin/fep_mai

Line 1000 diff -cr official+NetBSD/fep_main.c fep-cygwin/fep_mai

#ifdef TIOCSWINSZ

{

--- 936,942 ----

--- 954,960 ----

# if defined(TIOCKGETC) && defined(TIOCKSETC)

ioctl (slave, TIOCKSETC, (char *) &jtchars_buf);

# endif

Line 962 diff -cr official+NetBSD/fep_main.c fep-cygwin/fep_mai

Line 1009 diff -cr official+NetBSD/fep_main.c fep-cygwin/fep_mai

#ifdef TIOCSWINSZ

{

***************

*** 944,950 ****

*** 955,962 ****

--- 964,972 ----

--- 981,994 ----

suspend()

{

long pid;

+ #if defined(sun)

+ void (*func) (int);

+ #else

void (*func) __P((int));

+ #endif

+ #ifndef __CYGWIN32__

int omask;

+ #endif

Line 974 diff -cr official+NetBSD/fep_main.c fep-cygwin/fep_mai

Line 1026 diff -cr official+NetBSD/fep_main.c fep-cygwin/fep_mai

pid = getpid ();

***************

*** 953,959 ****

*** 965,971 ****

--- 975,983 ----

--- 997,1005 ----

signal (SIGTSTP, SIG_DFL);

recover_tty();

#define mask(s) (1 << ((s)-1))

+ #ifndef __CYGWIN32__

+ #if !defined(__CYGWIN32__) && !defined(sun)

omask = sigsetmask (sigblock (0) & ~mask (SIGTSTP));

+ #endif

kill (0, SIGTSTP);

if (kill (child_pid, SIGCONT) < 0 && errno == ESRCH) {

***************

*** 964,970 ****

*** 976,982 ****

--- 988,996 ----

--- 1010,1018 ----

kill (0, SIGCONT);

signal (SIGCHLD, func);

signal (SIGTSTP, SIG_IGN);

+ #ifndef __CYGWIN32__

+ #if !defined(__CYGWIN32__) && !defined(sun)

sigblock (mask (SIGTSTP));

+ #endif

fix_tty ();

if (look_var ("auto-repaint"))

fep_repaint(0);

diff -cr official+NetBSD/fep_set.c fep-cygwin/fep_set.c

Only in fep.orig: fep_main.c.rej

*** official+NetBSD/fep_set.c Mon Sep 2 15:54:01 2002

Only in fep: fep_main.o

--- fep-cygwin/fep_set.c Mon Sep 2 19:02:56 2002

diff -cr fep.orig/fep_set.c fep/fep_set.c

*** fep.orig/fep_set.c Wed Sep 18 18:48:31 2002

--- fep/fep_set.c Tue Sep 3 09:41:44 2002

***************

*** 3,9 ****

#ifndef lint

Line 1156 diff -cr official+NetBSD/fep_set.c fep-cygwin/fep_set.

Line 1210 diff -cr official+NetBSD/fep_set.c fep-cygwin/fep_set.

! #endif /* HASH */

return (vp);

}

diff -cr official+NetBSD/fep_stat.h fep-cygwin/fep_stat.h

Only in fep: fep_set.o

*** official+NetBSD/fep_stat.h Mon Sep 2 15:54:01 2002

diff -cr fep.orig/fep_stat.h fep/fep_stat.h

--- fep-cygwin/fep_stat.h Mon Sep 2 19:05:22 2002

*** fep.orig/fep_stat.h Wed Sep 18 18:48:31 2002

--- fep/fep_stat.h Tue Sep 3 09:41:44 2002

***************

*** 3,9 ****

#ifndef lint

Line 1176 diff -cr official+NetBSD/fep_stat.h fep-cygwin/fep_sta

Line 1231 diff -cr official+NetBSD/fep_stat.h fep-cygwin/fep_sta

extern long stat_obyte;

extern long stat_ibyte;

diff -cr official+NetBSD/fep_util.c fep-cygwin/fep_util.c

diff -cr fep.orig/fep_util.c fep/fep_util.c

*** official+NetBSD/fep_util.c Mon Sep 2 15:54:01 2002

*** fep.orig/fep_util.c Wed Sep 18 18:48:32 2002

--- fep-cygwin/fep_util.c Mon Sep 2 19:04:14 2002

--- fep/fep_util.c Wed Sep 18 18:44:49 2002

***************

*** 3,16 ****

#ifndef lint

Line 1206 diff -cr official+NetBSD/fep_util.c fep-cygwin/fep_uti

Line 1261 diff -cr official+NetBSD/fep_util.c fep-cygwin/fep_uti

#include <stdio.h>

#include <pwd.h>

#include <sys/types.h>

+ #if defined(__CYGWIN__)

+ #if defined(__CYGWIN__) || defined(sun)

+ #include <dirent.h>

+ #else

#include <sys/dir.h>

Line 1263 diff -cr official+NetBSD/fep_util.c fep-cygwin/fep_uti

Line 1318 diff -cr official+NetBSD/fep_util.c fep-cygwin/fep_uti

return (iskanji (*cp));

}

! #endif /* KANJI */

diff -cr official+NetBSD/fep_vi.c fep-cygwin/fep_vi.c

Only in fep: fep_util.o

*** official+NetBSD/fep_vi.c Mon Sep 2 15:54:21 2002

diff -cr fep.orig/fep_vi.c fep/fep_vi.c

--- fep-cygwin/fep_vi.c Mon Sep 2 19:02:30 2002

*** fep.orig/fep_vi.c Wed Sep 18 18:48:33 2002

--- fep/fep_vi.c Tue Sep 3 09:41:44 2002

***************

*** 3,15 ****

#ifndef lint

Line 1329 diff -cr official+NetBSD/fep_vi.c fep-cygwin/fep_vi.c

Line 1385 diff -cr official+NetBSD/fep_vi.c fep-cygwin/fep_vi.c

import (cft, tchars_buf.t_quitc, insert_and_flush);

import (cft, tchars_buf.t_eofc, send_eof);

import (cft, tchars_buf.t_brkc, insert_and_flush);

diff -cr official+NetBSD/feprc.sample fep-cygwin/feprc.sample

Only in fep: fep_vi.o

*** official+NetBSD/feprc.sample Mon Sep 2 15:54:02 2002

diff -cr fep.orig/feprc.sample fep/feprc.sample

--- fep-cygwin/feprc.sample Mon Sep 2 18:35:49 2002

*** fep.orig/feprc.sample Wed Sep 18 18:48:33 2002

--- fep/feprc.sample Tue Sep 3 09:41:44 2002

***************

*** 6,11 ****

--- 6,13 ----

Line 1361 diff -cr official+NetBSD/feprc.sample fep-cygwin/feprc

Line 1418 diff -cr official+NetBSD/feprc.sample fep-cygwin/feprc

+ fep-bind previous-history "\^[[A"

+ fep-bind next-history "\^[[B"

Only in fep: fepscript

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>