Deleted Added
sdiff udiff text old ( 146299 ) new ( 170331 )
full compact
main.c (146299) main.c (170331)
1/****************************************************************
2Copyright (C) Lucent Technologies 1997
3All Rights Reserved
4
5Permission to use, copy, modify, and distribute this software and
6its documentation for any purpose and without fee is hereby
7granted, provided that the above copyright notice appear in all
8copies and that both that the copyright notice and this

--- 8 unchanged lines hidden (view full) ---

17IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
18SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
19WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
20IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
21ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
22THIS SOFTWARE.
23****************************************************************/
24
1/****************************************************************
2Copyright (C) Lucent Technologies 1997
3All Rights Reserved
4
5Permission to use, copy, modify, and distribute this software and
6its documentation for any purpose and without fee is hereby
7granted, provided that the above copyright notice appear in all
8copies and that both that the copyright notice and this

--- 8 unchanged lines hidden (view full) ---

17IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
18SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
19WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
20IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
21ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
22THIS SOFTWARE.
23****************************************************************/
24
25const char *version = "version 20050424";
25const char *version = "version 20070501";
26
27#define DEBUG
28#include <stdio.h>
29#include <ctype.h>
30#include <locale.h>
31#include <stdlib.h>
32#include <string.h>
33#include <signal.h>

--- 22 unchanged lines hidden (view full) ---

56int main(int argc, char *argv[])
57{
58 const char *fs = NULL;
59
60 setlocale(LC_CTYPE, "");
61 setlocale(LC_NUMERIC, "C"); /* for parsing cmdline & prog */
62 cmdname = argv[0];
63 if (argc == 1) {
26
27#define DEBUG
28#include <stdio.h>
29#include <ctype.h>
30#include <locale.h>
31#include <stdlib.h>
32#include <string.h>
33#include <signal.h>

--- 22 unchanged lines hidden (view full) ---

56int main(int argc, char *argv[])
57{
58 const char *fs = NULL;
59
60 setlocale(LC_CTYPE, "");
61 setlocale(LC_NUMERIC, "C"); /* for parsing cmdline & prog */
62 cmdname = argv[0];
63 if (argc == 1) {
64 fprintf(stderr, "Usage: %s [-f programfile | 'program'] [-Ffieldsep] [-v var=value] [files]\n", cmdname);
64 fprintf(stderr,
65 "usage: %s [-F fs] [-v var=value] [-f progfile | 'prog'] [file ...]\n",
66 cmdname);
65 exit(1);
66 }
67 signal(SIGFPE, fpecatch);
68 yyin = NULL;
67 exit(1);
68 }
69 signal(SIGFPE, fpecatch);
70 yyin = NULL;
69 symtab = makesymtab(NSYMTAB);
71 symtab = makesymtab(NSYMTAB/NSYMTAB);
70 while (argc > 1 && argv[1][0] == '-' && argv[1][1] != '\0') {
72 while (argc > 1 && argv[1][0] == '-' && argv[1][1] != '\0') {
71 if (strcmp(argv[1], "--") == 0) { /* explicit end of args */
73 if (strcmp(argv[1],"-version") == 0 || strcmp(argv[1],"--version") == 0) {
74 printf("awk %s\n", version);
75 exit(0);
76 break;
77 }
78 if (strncmp(argv[1], "--", 2) == 0) { /* explicit end of args */
72 argc--;
73 argv++;
74 break;
75 }
76 switch (argv[1][1]) {
77 case 's':
78 if (strcmp(argv[1], "-safe") == 0)
79 safe = 1;

--- 22 unchanged lines hidden (view full) ---

102 }
103 if (fs == NULL || *fs == '\0')
104 WARNING("field separator FS is empty");
105 break;
106 case 'v': /* -v a=1 to be done NOW. one -v for each */
107 if (argv[1][2] == '\0' && --argc > 1 && isclvar((++argv)[1]))
108 setclvar(argv[1]);
109 break;
79 argc--;
80 argv++;
81 break;
82 }
83 switch (argv[1][1]) {
84 case 's':
85 if (strcmp(argv[1], "-safe") == 0)
86 safe = 1;

--- 22 unchanged lines hidden (view full) ---

109 }
110 if (fs == NULL || *fs == '\0')
111 WARNING("field separator FS is empty");
112 break;
113 case 'v': /* -v a=1 to be done NOW. one -v for each */
114 if (argv[1][2] == '\0' && --argc > 1 && isclvar((++argv)[1]))
115 setclvar(argv[1]);
116 break;
110 case 'm': /* more memory: -mr=record, -mf=fields */
111 /* no longer supported */
112 WARNING("obsolete option %s ignored", argv[1]);
113 break;
114 case 'd':
115 dbg = atoi(&argv[1][2]);
116 if (dbg == 0)
117 dbg = 1;
118 printf("awk %s\n", version);
119 break;
117 case 'd':
118 dbg = atoi(&argv[1][2]);
119 if (dbg == 0)
120 dbg = 1;
121 printf("awk %s\n", version);
122 break;
120 case 'V': /* added for exptools "standard" */
121 printf("awk %s\n", version);
122 exit(0);
123 break;
124 default:
125 WARNING("unknown option %s ignored", argv[1]);
126 break;
127 }
128 argc--;
129 argv++;
130 }
131 /* argv[1] is now the first argument */

--- 62 unchanged lines hidden --- 		123 default:
124 WARNING("unknown option %s ignored", argv[1]);
125 break;
126 }
127 argc--;
128 argv++;
129 }
130 /* argv[1] is now the first argument */

--- 62 unchanged lines hidden ---