summaryrefslogtreecommitdiff
path: root/net/generic-nqs/files/patch-af
blob: 67a1c59bd5b057602a7a01a00e1872cc5f26d0f5 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
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