diff options
Diffstat (limited to 'release/src/router/busybox/libbb/concat_subpath_file.c')
| -rw-r--r-- | release/src/router/busybox/libbb/concat_subpath_file.c | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/release/src/router/busybox/libbb/concat_subpath_file.c b/release/src/router/busybox/libbb/concat_subpath_file.c index 6d86f5e8..313fa63c 100644 --- a/release/src/router/busybox/libbb/concat_subpath_file.c +++ b/release/src/router/busybox/libbb/concat_subpath_file.c @@ -4,33 +4,20 @@ * * Copyright (C) (C) 2003 Vladimir Oleynik <dzo@simtreas.ru> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ /* 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" -extern 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); } |