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
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
|
diff -u -x CVS -x work -x core -x *.core -x #* -x *~ -x *.orig -x *.rej -I $Id.*$ -I $.+BSD.*$ mode.h.orig mode.h
--- mode.h.orig Fri Jun 4 02:51:02 2004
+++ mode.h Sat Jun 19 18:42:23 2004
@@ -1,6 +1,10 @@
#
/*
* UNIX shell
+ *
+ * S. R. Bourne
+ * Bell Telephone Laboratories
+ *
*/
@@ -10,23 +14,38 @@
TYPE char BOOL;
TYPE int UFD;
TYPE int INT;
+TYPE unsigned UINT;
TYPE float REAL;
TYPE char *ADDRESS;
-TYPE long int L_INT;
-TYPE int VOID;
-TYPE unsigned POS;
+TYPE long LONG;
+TYPE void VOID;
+TYPE size_t POS;
TYPE char *STRING;
+TYPE CONST char *CSTRING;
TYPE char MSG[];
+TYPE CONST char CMSG[];
TYPE int PIPE[];
TYPE char *STKPTR;
+TYPE const char *CSTKPTR;
TYPE char *BYTPTR;
-STRUCT stat STATBUF; /* defined in /usr/sys/stat.h */
+TYPE clock_t CLOCK;
+TYPE mode_t MODE;
+TYPE off_t OFFSET;
+TYPE sig_t SIGPTR;
+TYPE size_t SIZE;
+TYPE time_t TIME;
+TYPE uid_t UID;
+
+STRUCT dirent *DIRPTR; /* defined in dirent.h */
+STRUCT stat STATBUF; /* defined in sys/stat.h */
+STRUCT tms TIMEBUF; /* defined in sys/time.h */
+
STRUCT blk *BLKPTR;
STRUCT fileblk FILEBLK;
STRUCT filehdr FILEHDR;
-STRUCT fileblk *FILE;
-STRUCT trenod *TREPTR;
+STRUCT fileblk *FILEPTR;
+UNION trenod *TREPTR;
STRUCT forknod *FORKPTR;
STRUCT comnod *COMPTR;
STRUCT swnod *SWPTR;
@@ -44,7 +63,7 @@
STRUCT sysnod SYSNOD;
STRUCT sysnod *SYSPTR;
STRUCT sysnod SYSTAB[];
-#define NIL ((char*)0)
+#define NIL ((void*)0)
/* the following nonsense is required
@@ -52,8 +71,12 @@
* into an Rvalue so two cheats
* are necessary, one for each context.
*/
-union { int _cheat;};
-#define Lcheat(a) ((a)._cheat)
+#if defined(RENO)
+#define Lcheat(a) (*(int *)&(a))
+#else /* V7 */
+union _cheat { int _cheat;};
+#define Lcheat(a) ((*(union _cheat *)&(a))._cheat)
+#endif
#define Rcheat(a) ((int)(a))
@@ -69,11 +92,13 @@
BLKPTR _blkptr;
NAMPTR _namptr;
BYTPTR _bytptr;
- } address;
+} address;
+#if defined(V7)
/* for functions that do not return values */
struct void {INT vvvvvvvv;};
+#endif
/* heap storage */
@@ -90,7 +115,7 @@
STRING fnxt;
STRING fend;
STRING *feval;
- FILE fstak;
+ FILEPTR fstak;
CHAR fbuf[BUFSIZ];
};
@@ -103,21 +128,15 @@
STRING fnxt;
STRING fend;
STRING *feval;
- FILE fstak;
+ FILEPTR fstak;
CHAR _fbuf[1];
};
struct sysnod {
- STRING sysnam;
+ CSTRING sysnam;
INT sysval;
};
-/* this node is a proforma for those that follow */
-struct trenod {
- INT tretyp;
- IOPTR treio;
-};
-
/* dummy for access only */
struct argnod {
ARGPTR argnxt;
@@ -203,3 +222,16 @@
#define PARTYPE (sizeof(struct parnod))
#define LSTTYPE (sizeof(struct lstnod))
#define IOTYPE (sizeof(struct ionod))
+
+/* this node is a proforma for those that precede */
+union trenod {
+ struct { INT tretyp; IOPTR treio; } treio;
+ struct forknod forknod;
+ struct comnod comnod;
+ struct ifnod ifnod;
+ struct whnod whnod;
+ struct fornod fornod;
+ struct swnod swnod;
+ struct parnod parnod;
+ struct lstnod lstnod;
+};
|
