libbb: move nuke_str() from passwd into libbb

[oweals/busybox.git] / libbb / concat_subpath_file.c

diff --git a/libbb/concat_subpath_file.c b/libbb/concat_subpath_file.c
index 6ebc01bf500c4fd0380d624d8565c9d64167f82a..c9167d492dae6269ff7679a3338c794492b6d666 100644 (file)
--- a/libbb/concat_subpath_file.c
+++ b/libbb/concat_subpath_file.c
@@ -4,20 +4,20 @@
  *
  * Copyright (C) (C) 2003  Vladimir Oleynik  <dzo@simtreas.ru>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 /*
    This function make special for recursive actions with usage
    concat_path_file(path, filename)
-   and skiping "." and ".." directory entries
+   and skipping "." and ".." directory entries
 */
 
 #include "libbb.h"
 
-char *concat_subpath_file(const char *path, const char *f)
+char* FAST_FUNC concat_subpath_file(const char *path, const char *f)
 {
-       if(f && *f == '.' && (!f[1] || (f[1] == '.' && !f[2])))
+       if (f && DOT_OR_DOTDOT(f))
                return NULL;
        return concat_path_file(path, f);
 }