maint: factor out cycle warning, now that du will use it, too

* src/system.h (emit_cycle_warning): Define.  Factored out of...
* src/remove.c (rm_fts): ...here.  Use the new macro.
This commit is contained in:
Jim Meyering committed 2009-11-05 08:32:31 +01:00
1 parent d4b96c26ce
commit 38cb824673
2 files changed
+13 -6

No files matched your search

+1 -6
View File
@@ -564,12 +564,7 @@ rm_fts (FTS *fts, FTSENT *ent, struct rm_options const *x)
}
case FTS_DC: /* directory that causes cycles */
error (0, 0, _("\
WARNING: Circular directory structure.\n\
This almost certainly means that you have a corrupted file system.\n\
NOTIFY YOUR SYSTEM MANAGER.\n\
The following directory is part of the cycle:\n %s\n"),
quote (ent->fts_path));
emit_cycle_warning (ent->fts_path);
fts_skip_tree (fts, ent);
return RM_ERROR;
+12
View File
@@ -672,6 +672,18 @@ io_blksize (struct stat sb)
void usage (int status) ATTRIBUTE_NORETURN;
#define emit_cycle_warning(file_name) \
do \
{ \
error (0, 0, _("\
WARNING: Circular directory structure.\n\
This almost certainly means that you have a corrupted file system.\n\
NOTIFY YOUR SYSTEM MANAGER.\n\
The following directory is part of the cycle:\n %s\n"), \
quote (file_name)); \
} \
while (0)
#ifndef ARRAY_CARDINALITY
# define ARRAY_CARDINALITY(Array) (sizeof (Array) / sizeof *(Array))
#endif