Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/libbb/concat_subpath_file.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/libbb/concat_subpath_file.c (modified) (3 diffs)

branches/2.2.5/mindi-busybox/libbb/concat_subpath_file.c

@@ -5 +5 @@
  * 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.
  */
 
@@ -24 +11 @@
    This function make special for recursive actions with usage
    concat_path_file(path, filename)
-   and skiping "." and ".." directory entries
+   and skipping "." and ".." directory entries
 */
 
@@ -31 +18 @@
 char *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);