ViewVC Help

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

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

Comparing ray/src/util/rcollate.c (file contents):
Revision 2.13 by greg, Fri May 30 18:24:06 2014 UTC vs.
Revision 2.15 by greg, Tue Jul 8 16:39:41 2014 UTC

#	Line 288 | Line 288 | check_sizes()
288		comp_size = sizeof(double);
289		else if (!strcmp(fmtid, "byte"))
290		comp_size = 1;
291	<	else {
291	>	else if (strcmp(fmtid, "ascii")) {
292		fprintf(stderr, "Unsupported format: %s\n", fmtid);
293		return(0);
294		}
#	Line 460 | Line 460 | headline(char *s, void *p)
460		if (!strncmp(s, "NCOMP=", 6)) {
461		n = atoi(s+6);
462		if ((n_comp > 0) & (n != n_comp)) {
463	<	fputs("Incorrect number of components", stderr);
463	>	fputs("Incorrect number of components\n", stderr);
464		return(-1);
465		}
466		n_comp = n;
#	Line 477 | Line 477 | main(int argc, char *argv[])
477		int     i_header = 1;                   /* input header? */
478		int     o_header = 1;                   /* output header? */
479		int     transpose = 0;                  /* transpose rows & cols? */
480	<	int     i;
480	>	int     a;
481
482	<	for (i = 1; i < argc && argv[i][0] == '-'; i++)
483	<	switch (argv[i][1]) {
482	>	for (a = 1; a < argc && argv[a][0] == '-'; a++)
483	>	switch (argv[a][1]) {
484		case 'i':                       /* input */
485	<	if (argv[i][2] == 'c')  /* columns */
486	<	ni_columns = atoi(argv[++i]);
487	<	else if (argv[i][2] == 'r')
488	<	ni_rows = atoi(argv[++i]);
485	>	if (argv[a][2] == 'c')  /* columns */
486	>	ni_columns = atoi(argv[++a]);
487	>	else if (argv[a][2] == 'r')
488	>	ni_rows = atoi(argv[++a]);
489		else
490		goto userr;
491		break;
492		case 'o':                       /* output */
493	<	if (argv[i][2] == 'c')  /* columns */
494	<	no_columns = atoi(argv[++i]);
495	<	else if (argv[i][2] == 'r')
496	<	no_rows = atoi(argv[++i]);
493	>	if (argv[a][2] == 'c')  /* columns */
494	>	no_columns = atoi(argv[++a]);
495	>	else if (argv[a][2] == 'r')
496	>	no_rows = atoi(argv[++a]);
497		else
498		goto userr;
499		break;
500		case 'h':                       /* turn off header */
501	<	switch (argv[i][2]) {
501	>	switch (argv[a][2]) {
502		case 'i':
503		i_header = 0;
504		break;
#	Line 516 | Line 516 | main(int argc, char *argv[])
516		transpose = !transpose;
517		break;
518		case 'f':                       /* format */
519	<	switch (argv[i][2]) {
519	>	switch (argv[a][2]) {
520		case 'a':               /* ASCII */
521		case 'A':
522		fmtid = "ascii";
#	Line 540 | Line 540 | main(int argc, char *argv[])
540		default:
541		goto userr;
542		}
543	<	if (argv[i][3]) {
544	<	if (!isdigit(argv[i][3]))
543	>	if (argv[a][3]) {
544	>	if (!isdigit(argv[a][3]))
545		goto userr;
546	<	n_comp = atoi(argv[i]+3);
547	<	}
546	>	n_comp = atoi(argv[a]+3);
547	>	} else
548	>	n_comp = 1;
549		break;
550		case 'w':                       /* warnings on/off */
551		warnings = !warnings;
#	Line 552 | Line 553 | main(int argc, char *argv[])
553		default:
554		goto userr;
555		}
556	<	if (i < argc-1)                         /* arg count OK? */
556	>	if (a < argc-1)                         /* arg count OK? */
557		goto userr;
558		/* open input file? */
559	<	if (i == argc-1 && freopen(argv[i], "r", stdin) == NULL) {
560	<	fprintf(stderr, "%s: cannot open for reading\n", argv[i]);
559	>	if (a == argc-1 && freopen(argv[a], "r", stdin) == NULL) {
560	>	fprintf(stderr, "%s: cannot open for reading\n", argv[a]);
561		return(1);
562		}
563		if (comp_size) {
#	Line 574 | Line 575 | main(int argc, char *argv[])
575		return(0);
576		}
577		if (i_header) {                         /* read header */
578	<	if (getheader(stdin, &headline, NULL) < 0)
578	>	if (getheader(stdin, headline, NULL) < 0)
579		return(1);
580		if (!check_sizes())
581		return(1);
#	Line 585 | Line 586 | main(int argc, char *argv[])
586		} else if (!check_sizes())
587		return(1);
588		if (o_header) {                         /* write header */
589	<	printargs(argc, argv, stdout);
589	>	printargs(a, argv, stdout);
590		if (transpose && (no_rows <= 0) & (no_columns <= 0)) {
591		if (ni_rows > 0) no_columns = ni_rows;
592		if (ni_columns > 0) no_rows = ni_columns;
#	Line 600 | Line 601 | main(int argc, char *argv[])
601		}
602		if (transpose) {                        /* transposing rows & columns? */
603		MEMLOAD myMem;                  /* need to load into memory */
604	<	if (i == argc-1) {
604	>	if (a == argc-1) {
605		if (load_file(&myMem, stdin) <= 0) {
606		fprintf(stderr, "%s: error loading file into memory\n",
607	<	argv[i]);
607	>	argv[a]);
608		return(1);
609		}
610		} else if (load_stream(&myMem, stdin) <= 0) {

Diff Legend

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