X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fpaths.c;h=4b9db67f87ebed18b7404c5864cf676f4fb6c5a4;hp=62347c9fbd25027aec8ad183208e1941ebb85792;hb=a8d148d9b2a765ba7fcbce927ea2546f917afe53;hpb=eeb96703721a2ba6c64ec63f2c330515e8992b4f diff --git a/src/paths.c b/src/paths.c index 62347c9f..4b9db67f 100644 --- a/src/paths.c +++ b/src/paths.c @@ -5,32 +5,30 @@ /* * Copyright (C) 2012, 2013 Eric Biggers * - * This file is part of wimlib, a library for working with WIM files. + * This file is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) any + * later version. * - * wimlib 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 3 of the License, or (at your option) - * any later version. - * - * wimlib 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 + * This file 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 Lesser General Public License for more * details. * - * You should have received a copy of the GNU General Public License - * along with wimlib; if not, see http://www.gnu.org/licenses/. + * You should have received a copy of the GNU Lesser General Public License + * along with this file; if not, see http://www.gnu.org/licenses/. */ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include + #include "wimlib.h" #include "wimlib/paths.h" #include "wimlib/util.h" -#include - /* Like the basename() function, but does not modify @path; it just returns a * pointer to it. This assumes the path separator is the * OS_PREFERRED_PATH_SEPARATOR. */ @@ -74,15 +72,6 @@ path_stream_name(const tchar *path) return stream_name + 1; } -/* Duplicate a path; return empty string for NULL input. */ -tchar * -canonicalize_fs_path(const tchar *fs_path) -{ - if (fs_path == NULL) - fs_path = T(""); - return TSTRDUP(fs_path); -} - /* Collapse and translate path separators, and strip trailing slashes. Doesn't * add or delete a leading slash. * @@ -124,7 +113,7 @@ do_canonicalize_path(const tchar *in, tchar *out) * * Examples (with WIM_PATH_SEPARATOR == '/'): * - * => / [ either NULL or empty string ] + * => / [ either NULL or empty string ] * / => / * \ => / * hello => /hello