Mercurial > hg > toybox
view toys/posix/rmdir.c @ 1613:96aa7ec74936 draft
Fix yet another sed bug.
The s/// command would copy the \ of substitutions before deciding what to
do with them (generally overwriting the \ with the new data). When the
substitution was A) at the very end of the new string, B) resolved to nothing,
it could leave a trailing \ that didn't belong there and didn't get overwritten
because the "copy trailing data" part that copies the original string's null
terminator already happened before the \ overwrote it.
The ghostwheel() function restarts regexes after embedded NUL bytes, but
if the string it's passed is _longer_ than the length it's told then it
gets confused (and it means we're off the end of our allocation so segfaults
are likely).
Fix: test for \ first and move the "copy byte" logic into an else case.
author | Rob Landley <rob@landley.net> |
---|---|
date | Mon, 15 Dec 2014 03:34:55 -0600 |
parents | fc1bb49e58a9 |
children |
line wrap: on
line source
/* rmdir.c - remove directory/path * * Copyright 2008 Rob Landley <rob@landley.net> * * See http://opengroup.org/onlinepubs/9699919799/utilities/rmdir.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) { char *temp; for (;;) { if (rmdir(name)) { perror_msg("%s",name); return; } // Each -p cycle back up one slash, ignoring trailing and repeated /. if (!toys.optflags) return; do { if (!(temp = strrchr(name, '/'))) return; *temp = 0; } while (!temp[1]); } } void rmdir_main(void) { char **s; for (s=toys.optargs; *s; s++) do_rmdir(*s); }