Mercurial > hg > toybox
view toys/rmdir.c @ 293:6baa13382880
Sort was including the trailing comma and getting the order wrong.
(Specifically, it was comparing "sh," with "sha1sum," and putting sha1sum first
in generated/newtoys.h so the binary search wasn't finding sha1sum. Alas, you
can't feed separate beginning and ending delimiters to "sort -t". The fix is
to copy the appropriate field out with sed, duplicate it at the start of the
string where it's easy to compare, and then remove it again with a second
sed after the sort.
author | Rob Landley <rob@landley.net> |
---|---|
date | Mon, 12 May 2008 01:23:19 -0500 |
parents | d37e2de3a9f3 |
children | 75a69d5550a0 |
line wrap: on
line source
/* vi: set sw=4 ts=4: * * hello.c - A hello world program. * * Copyright 2006 Rob Landley <rob@landley.net> * * See http://www.opengroup.org/onlinepubs/009695399/utilities/cat.html USE_RMDIR(NEWTOY(rmdir, "<1p", TOYFLAG_BIN)) config RMDIR bool "rmdir" default y help usage: rmdir [-p] [dirname...] Remove one or more directories. -p Remove path. */ #include "toys.h" static void do_rmdir(char *name) { for (;;) { char *temp; if (rmdir(name)) { perror_msg("%s",name); return; } if (!toys.optflags) return; if (!(temp=strrchr(name,'/'))) return; *temp=0; } } void rmdir_main(void) { char **s; for (s=toys.optargs; *s; s++) do_rmdir(*s); }