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 1.2 by greg, Thu Jun 28 16:39:32 1990 UTC vs.
Revision 2.8 by schorsch, Fri Jan 2 11:44:24 2004 UTC

#	Line 1 | Line 1
1	–	/* Copyright (c) 1986 Regents of the University of California */
2	–
1		#ifndef lint
2	<	static char SCCSid[] = "$SunId$ LBL";
2	>	static const char       RCSid[] = "$Id$";
3		#endif
6	–
4		/*
5		*  getinfo.c - program to read info. header from file.
6		*
#	Line 11 | Line 8 | static char SCCSid[] = "$SunId$ LBL";
8		*/
9
10		#include  <stdio.h>
11	+	#include  <string.h>
12
13	+	#include  "platform.h"
14	+	#include  "resolu.h"
15
16	<	tabstr(s)                               /* put out line followed by tab */
17	<	register char  *s;
16	>	static gethfunc tabstr;
17	>	static void getdim(register FILE *fp);
18	>	static void copycat(void);
19	>
20	>
21	>	static int
22	>	tabstr(                         /* put out line followed by tab */
23	>	register char  *s,
24	>	void *p
25	>	)
26		{
27		while (*s) {
28		putchar(*s);
#	Line 22 | Line 30 | register char  *s;
30		}
31		if (*--s == '\n')
32		putchar('\t');
33	+	return(0);
34		}
35
36
37	<	main(argc, argv)
38	<	int  argc;
39	<	char  *argv[];
37	>	int
38	>	main(
39	>	int  argc,
40	>	char  **argv
41	>	)
42		{
43		int  dim = 0;
44		FILE  *fp;
#	Line 36 | Line 47 | char  *argv[];
47		if (argc > 1 && !strcmp(argv[1], "-d")) {
48		argc--; argv++;
49		dim = 1;
50	+	SET_DEFAULT_BINARY(); /* for output file */
51	+	SET_FILE_BINARY(stdin);
52		} else if (argc == 2 && !strcmp(argv[1], "-")) {
53	<	getheader(stdin, NULL);
53	>	SET_FILE_BINARY(stdin);
54	>	SET_FILE_BINARY(stdout);
55	>	getheader(stdin, NULL, NULL);
56		copycat();
57	<	exit(0);
57	>	return 0;
58		}
59		for (i = 1; i < argc; i++) {
60		fputs(argv[i], stdout);
#	Line 50 | Line 65 | char  *argv[];
65		fputs(": ", stdout);
66		getdim(fp);
67		} else {
68	<	tabstr(":\n");
69	<	getheader(fp, tabstr);
68	>	tabstr(":\n", NULL);
69	>	getheader(fp, tabstr, NULL);
70		putchar('\n');
71		}
72		fclose(fp);
73		}
74		}
75	<	if (argc == 1)
75	>	if (argc == 1) {
76		if (dim) {
77		getdim(stdin);
78		} else {
79	<	copyheader(stdin, stdout);
79	>	getheader(stdin, (gethfunc*)fputs, stdout);
80		putchar('\n');
81		}
82	<	exit(0);
82	>	}
83	>	return 0;
84		}
85
86
87	<	getdim(fp)                              /* get dimensions from file */
88	<	register FILE  *fp;
87	>	static void
88	>	getdim(                         /* get dimensions from file */
89	>	register FILE  *fp
90	>	)
91		{
92		int  j;
93		register int  c;
94
95	<	getheader(fp, NULL);    /* skip header */
95	>	getheader(fp, NULL, NULL);      /* skip header */
96
97		switch (c = getc(fp)) {
98		case '+':               /* picture */
#	Line 103 | Line 121 | register FILE  *fp;
121		}
122
123
124	<	copycat()                       /* copy input to output */
124	>	static void
125	>	copycat(void)                   /* copy input to output */
126		{
127		register int    c;
128

Diff Legend

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