diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2000-04-16 09:31:00 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2000-04-16 09:31:00 +0000 |
| commit | 142040ae41461610997efd1fafd8c9f6506f2970 (patch) | |
| tree | 615a6a73774cb8837661ea80882d7a7457d9d489 /net/generic-nqs | |
| parent | dba281ef607acf920a03d74f33f4bb0d63824ba6 (diff) | |
| download | ports-142040ae41461610997efd1fafd8c9f6506f2970.tar.gz ports-142040ae41461610997efd1fafd8c9f6506f2970.zip | |
Add patch.
Notes
Notes:
svn path=/head/; revision=27643
Diffstat (limited to 'net/generic-nqs')
| -rw-r--r-- | net/generic-nqs/files/patch-af | 130 |
1 files changed, 130 insertions, 0 deletions
diff --git a/net/generic-nqs/files/patch-af b/net/generic-nqs/files/patch-af new file mode 100644 index 000000000000..67a1c59bd5b0 --- /dev/null +++ b/net/generic-nqs/files/patch-af @@ -0,0 +1,130 @@ +--- Source-Tree/lpserver/all-systems/lpserver.c.orig Mon Mar 20 00:18:51 2000 ++++ Source-Tree/lpserver/all-systems/lpserver.c Mon Apr 10 20:37:29 2000 +@@ -29,13 +29,14 @@ + + #if GPORT_HAS_termios_h + #include <termios.h> +-#endif ++#else /* for BSD platforms */ + #if GPORT_HAS_sgtty_h + #include <sgtty.h> + #if GPORT_HAS_termio_h + #include <termio.h> /* for SUN */ + #endif + #endif ++#endif + + #include <sys/wait.h> + #include <unistd.h> +@@ -75,7 +76,8 @@ + static struct termios save; /* Original printer characteristics */ + #else + #if GPORT_HAS_BSD_IOCTL +-static struct sgttyb save; /* Original printer characteristics */ ++static struct termios save; /* Original printer characteristics */ ++/*static struct sgttyb save;*/ /* Original printer characteristics */ + #else + BAD SYSTEM TYPE + #endif +@@ -1201,7 +1203,8 @@ + struct termios tbuf; /* Used for printer ioctl() */ + #else + #if GPORT_HAS_sgtty_h && (GPORT_HAS_BSD_IOCTL) +- struct sgttyb tbuf; /* Used for printer ioctl() */ ++ struct termios tbuf; /* Used for printer ioctl() */ ++/* struct sgttyb tbuf; */ /* Used for printer ioctl() */ + int bsdmask; + #else + BAD SYSTEM TYPE +@@ -1447,10 +1450,10 @@ + */ + #if GPORT_HAS_POSIX_IOCTL + if (translate) +- ioctl (fileno (stdout), TCGETA, &save); ++ ioctl (fileno (stdout), TCGETS, &save); + #else + #if GPORT_HAS_BSD_IOCTL +- ioctl (fileno (stdout), TIOCGETP , &save); ++ ioctl (fileno (stdout), TIOCGETA , &save); + #else + BAD SYSTEM TYPE + #endif +@@ -1566,13 +1569,13 @@ + * Set new device state. + */ + tbuf = save; +-#if GPORT_HAS_POSIX_IOCTL ++#if GPORT_HAS_POSIX_IOCTL || (GPORT_HAS_BSD_IOCTL) + tbuf.c_iflag = IGNPAR | ISTRIP | BRKINT | IXON; +- tbuf.c_oflag = OPOST | ONLCR | TAB3 | FF1; ++ tbuf.c_oflag = OPOST | ONLCR | OXTABS | ONOEOT; + tbuf.c_cflag = baud | bits | CREAD | PARENB; + tbuf.c_lflag = ISIG; + if (translate) +- ioctl (fileno (stdout), TCSETA, &tbuf); ++ ioctl (fileno (stdout), TIOCSETA, &tbuf); + #else + #if GPORT_HAS_BSD_IOCTL + /* +@@ -1772,34 +1775,40 @@ + */ + #if GPORT_HAS_POSIX_IOCTL + if (translate) +- ioctl (fileno (stdout), TCSETAW, &save); ++ ioctl (fileno (stdout), TCSETSW, &save); + #else + #if GPORT_HAS_BSD_IOCTL +- ioctl (fileno (stdout), TIOCSETP , &save); ++ ioctl (fileno (stdout), TIOCSETA , &save); + #else + BAD SYSTEM TYPE + #endif + #endif + errno=0; +- if (model_interface && forked) ++ if (model_interface && forked) { + while((ret=wait (&status)) == -1 && + (errno == EINTR || errno == ENOTTY)); ++ } + + /* + * Format message with number of pages printed and exit. + */ +- if (status != 0) +- if ((status & 0xFF) == 0) ++ if (status != 0) { ++ if ((status & 0xFF) == 0) { + sprintf(message, "Interface: _exit value was: %1d.", + (status >> 8) & 0xFF); +- else if ((status & 0xFF00) == 0) ++ } ++ else if ((status & 0xFF00) == 0) { + sprintf(message, + "Interface: Aborting signal was %1d.", + status & 0x7F); +- else if (no_preprocess) ++ } ++ } ++ else if (no_preprocess) { + sprintf (message, "1 job completed."); +- else ++ } ++ else { + sprintf (message, "%1d pages printed.", pages); ++ } + serexit (RCM_EXITED, message); + return 0; + } +@@ -2035,10 +2044,10 @@ + */ + #if GPORT_HAS_POSIX_IOCTL + if (translate) +- ioctl (fileno (stdout), TCSETAW, &save); ++ ioctl (fileno (stdout), TCSETSW, &save); + #else + #if GPORT_HAS_BSD_IOCTL +- ioctl (fileno (stdout), TIOCSETP , &save); ++ ioctl (fileno (stdout), TIOCSETA , &save); + #else + BAD SYSTEM TYPE + #endif |