view toys/other/dos2unix.c @ 1634:5fac2769a159 draft

Redo option parsing infrastructure so #define FORCE_FLAGS can unzero flag macros for a disabled command (needed when multiple commands share infrastructure with a common set of flags). This means the flag space is no longer packed, but leaves gaps where the zeroes go. (Actual flag bit positions are the same for all configs.) Since the option parsing needs to know where the holes are, the OPTSTR values are now generated as part of flags.h with ascii 1 values for the disabled values. (So generated/oldflags.h went away.) This also means that the option string argument for OLDTOY() went away, it now uses the same arguments as the NEWTOY() it references.
author Rob Landley <>
date Wed, 31 Dec 2014 21:30:59 -0600
parents 6cc69be43c42
children 3d1b78e5e066
line wrap: on
line source

/* dos2unix.c - convert newline format
 * Copyright 2012 Rob Landley <>

USE_DOS2UNIX(OLDTOY(unix2dos, dos2unix, TOYFLAG_BIN))

config DOS2UNIX
  bool "dos2unix/unix2dos"
  default y
    usage: dos2unix/unix2dos [file...]

    Convert newline format between dos (\r\n) and unix (just \n)
    If no files listed copy from stdin, "-" is a synonym for stdin.

#define FOR_dos2unix
#include "toys.h"

  char *tempfile;

static void do_dos2unix(int fd, char *name)
  char c = toys.which->name[0];
  int outfd = 1, catch = 0;

  if (fd) outfd = copy_tempfile(fd, name, &TT.tempfile);

  for (;;) {
    int len, in, out;

    len = read(fd, toybuf+(sizeof(toybuf)/2), sizeof(toybuf)/2);
    if (len<0) perror_msg("%s",name);
    if (len<1) break;

    for (in = out = 0; in < len; in++) {
      char x = toybuf[in+sizeof(toybuf)/2];

      // Drop \r only if followed by \n in dos2unix mode
      if (catch) {
        if (c == 'u' || x != '\n') toybuf[out++] = '\r';
        catch = 0;
      // Add \r only if \n not after \r in unix2dos mode
      } else if (c == 'u' && x == '\n') toybuf[out++] = '\r';

      if (x == '\r') catch++;
      else toybuf[out++] = x;
    xwrite(outfd, toybuf, out);
  if (catch) xwrite(outfd, "\r", 1);

  if (fd) replace_tempfile(-1, outfd, &TT.tempfile);

void dos2unix_main(void)
  loopfiles(toys.optargs, do_dos2unix);