tacit/minix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bin/rmdir: sync with NetBSD-8

Browse Source 
NetBSD PR/48182: Fix rmdir -p handling of top-level (root) directory.
This commit is contained in:
Sevan Janiyan 2018-11-04 14:40:04 +00:00
parent 3d71ae06b1
commit 876923e9a0
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/rmdir/rmdir.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rmdir.c,v 1.26 2011/08/29 14:49:38 joerg Exp $ */
/* $NetBSD: rmdir.c,v 1.26.36.1 2017/08/14 23:54:30 snj Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\
#if 0
static char sccsid[] = "@(#)rmdir.c 8.3 (Berkeley) 4/2/94";
#else
__RCSID("$NetBSD: rmdir.c,v 1.26 2011/08/29 14:49:38 joerg Exp $");
__RCSID("$NetBSD: rmdir.c,v 1.26.36.1 2017/08/14 23:54:30 snj Exp $");
#endif
#endif /* not lint */
@ -103,6 +103,10 @@ rm_path(char *path)
/* Ignore trailing '/' on deleted name */
continue;
if (*path == 0)
/* At top level (root) directory */
break;
if (rmdir(path) < 0) {
warn("%s", path);
return (1);