ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/util/getinfo.c

Comparing ray/src/util/getinfo.c (file contents):
Revision 2.16 by greg, Tue Mar 20 18:18:39 2018 UTC vs.
Revision 2.18 by greg, Sat Jul 6 14:08:07 2019 UTC

#	Line 57 | Line 57 | main(
57		if (argc > 1 && !strcmp(argv[1], "-d")) {
58		argc--; argv++;
59		dim = 1;
60	<	SET_FILE_BINARY(stdin);
61	<	} else if (argc > 2 && !strcmp(argv[1], "-c")) {
62	<	SET_FILE_BINARY(stdin);
60	>	}
61	>	#ifdef getc_unlocked                            /* avoid lock/unlock overhead */
62	>	flockfile(stdin);
63	>	#endif
64	>	SET_FILE_BINARY(stdin);
65	>	if (argc > 2 && !strcmp(argv[1], "-c")) {
66		SET_FILE_BINARY(stdout);
67		setvbuf(stdin, NULL, _IONBF, 2);
68	<	getheader(stdin, (gethfunc *)fputs, stdout);
68	>	if (getheader(stdin, (gethfunc *)fputs, stdout) < 0)
69	>	return 1;
70		printargs(argc-2, argv+2, stdout);
71		fputc('\n', stdout);
72	+	if (dim) {                      /* copy resolution string? */
73	+	RESOLU  rs;
74	+	if (!fgetsresolu(&rs, stdin)) {
75	+	fputs("No resolution string\n", stderr);
76	+	return 1;
77	+	}
78	+	fputsresolu(&rs, stdout);
79	+	}
80		fflush(stdout);
81		execvp(argv[2], argv+2);
82		perror(argv[2]);
83		return 1;
84		} else if (argc > 2 && !strcmp(argv[1], "-a")) {
73	–	SET_FILE_BINARY(stdin);
85		SET_FILE_BINARY(stdout);
86	<	getheader(stdin, (gethfunc *)fputs, stdout);
86	>	if (getheader(stdin, (gethfunc *)fputs, stdout) < 0)
87	>	return 1;
88		for (i = 2; i < argc; i++) {
89		int     len = strlen(argv[i]);
90		if (!len) continue;
#	Line 84 | Line 96 | main(
96		copycat();
97		return 0;
98		} else if (argc == 2 && !strcmp(argv[1], "-")) {
87	–	SET_FILE_BINARY(stdin);
99		SET_FILE_BINARY(stdout);
100	<	getheader(stdin, NULL, NULL);
100	>	if (getheader(stdin, NULL, NULL) < 0)
101	>	return 1;
102	>	if (dim) {                      /* skip resolution string? */
103	>	RESOLU  rs;
104	>	if (!fgetsresolu(&rs, stdin)) {
105	>	fputs("No resolution string\n", stderr);
106	>	return 1;
107	>	}
108	>	}
109		copycat();
110		return 0;
111		}
#	Line 110 | Line 129 | main(
129		if (dim) {
130		getdim(stdin);
131		} else {
132	<	getheader(stdin, (gethfunc *)fputs, stdout);
132	>	if (getheader(stdin, (gethfunc *)fputs, stdout) < 0)
133	>	return 1;
134		fputc('\n', stdout);
135		}
136		}
#	Line 125 | Line 145 | getdim(                                /* get dimensions from file */
145		{
146		int  j;
147		int  c;
148	<
149	<	getheader(fp, NULL, NULL);      /* skip header */
150	<
148	>	/* skip header */
149	>	if (getheader(fp, NULL, NULL) < 0) {
150	>	fputs("bad header\n", stdout);
151	>	return;
152	>	}
153		switch (c = getc(fp)) {
154		case '+':               /* picture */
155		case '-':

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)