ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/util/rcollate.c
(Generate patch)

Comparing ray/src/util/rcollate.c (file contents):
Revision 2.16 by greg, Wed Jul 9 21:45:48 2014 UTC vs.
Revision 2.18 by greg, Fri Aug 1 18:21:04 2014 UTC

# Line 572 | Line 572 | main(int argc, char *argv[])
572                  SET_FILE_BINARY(stdout);
573          }
574                                                  /* check for no-op */
575 <        if (!transpose & (i_header == o_header) && (comp_size ||
575 >        if (!transpose & !i_header & !o_header && (comp_size ||
576                          (no_columns == ni_columns) & (no_rows == ni_rows))) {
577                  if (warnings)
578                          fprintf(stderr, "%s: no-op -- copying input verbatim\n",
# Line 617 | Line 617 | main(int argc, char *argv[])
617                  }
618                  if (!do_transpose(&myMem))
619                          return(1);
620 <                /* free_load(&myMem); */
621 <        } else if (!do_resize(stdin))           /* just reshaping input */
620 >                /* free_load(&myMem);   about to exit, so don't bother */
621 >        } else if (comp_size || (no_columns==ni_columns) & (no_rows==ni_rows)) {
622 >                if (!output_stream(stdin))      /* just changed header */
623 >                        return(1);
624 >        } else if (!do_resize(stdin))           /* reshaping input */
625                  return(1);
626          return(0);
627   userr:

Diff Legend

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