From 954775be326ea77f57b545b86a9ac65ac5c1d2eb Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 17 Nov 2015 02:16:27 +0100 Subject: split libgen.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/libgen.c | 185 ---------------------------------------------- src/libgen/basename_xpg.c | 43 +++++++++++ src/libgen/cleanname.c | 102 +++++++++++++++++++++++++ src/libgen/dirname.c | 51 +++++++++++++ src/string/basename_gnu.c | 52 +++++++++++++ 5 files changed, 248 insertions(+), 185 deletions(-) delete mode 100644 src/libgen.c create mode 100644 src/libgen/basename_xpg.c create mode 100644 src/libgen/cleanname.c create mode 100644 src/libgen/dirname.c create mode 100644 src/string/basename_gnu.c diff --git a/src/libgen.c b/src/libgen.c deleted file mode 100644 index bb36337..0000000 --- a/src/libgen.c +++ /dev/null @@ -1,185 +0,0 @@ -/** - * slibc — Yet another C library - * Copyright © 2015 Mattias Andrée (maandree@member.fsf.org) - * - * 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 3 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, see . - */ -#include -#include -#include - - -# pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" - - - -/** - * Get the basename of a filename. - * - * This is a GNU extension, include - * to override it with the XPG-compliant implementation. - * - * @param filename The filename. - * @return The basename, it is either a substring - * of `filename` or, if `filename` is `NULL` - * or is empty, a statically allocationed string, - * so it must not freed or edited. - */ -char* __gnu_basename(const char* filename) -{ - char* r = filename; - char last = '/'; - if (filename == NULL) - return "."; - while (*filename) - { - if ((*filename != '/') && (last == '/')) - r = filename; - last = *filename++; - } - return r; -} - - -/** - * Get the basename of a filename, remove - * trailing slashes. - * - * @param filename The filename, may be edited by this function. - * @return The basename, it is either a substring - * of `filename` or, if `filename` is `NULL` - * or is empty, a statically allocationed string, - * so it must not freed or edited. - */ -char* __xpg_basename(char* filename) -{ - char* r = __gnu_basename(filename); - char* p; - if (strcmp(r, ".")) - for (p = r + 1; *p; p++) - if (*p == '/') - *p = 0; - return r; -} - - -/** - * Get the dirname of a filename. - * - * @param filename The filename, may be edited by this function. - * @return The dirname, it is either a substring - * of `filename` or, if `filename` is `NULL` - * or does no contain a non-trailing slash, - * a statically allocationed string, so it - * must not freed or edited. - */ -char* dirname(char* filename) -{ - int have_nonslash = 0; - char* last_slash = NULL; - char c, d; - if ((filename == NULL) || (!*filename)) - return "."; - for (; (c = *filename); filename++) - { - d = filename[1]; - have_nonslash |= c - '/'; - if ((c == '/') && d && (d != '/')) - last_slash = filename; - } - if (!have_nonslash) return "/"; - if (last_slash == NULL) return "."; - return *last_slash = 0, filename; -} - - -/** - * Removes all trailing slashes (that is not the first character - * in the filename,), all duplicate slashes, all '.' directory - * components, and when possible using only lexical analysis, - * resolves '..' directory components. - * - * '..' directory components that should resolve up beyond '/', - * are removed. Note that this can in fact mean that the resulting - * path is not the same file if the processes is `chroot`:ed. - * Additionally, and more important, there is no consideration for - * symbolic links. For example, '/a/b/c/..' resolves to '/a/b', - * but if any of the directors are symbolic links, the real path - * is not necessarily '/a/b'. - * - * This is a slibc extension. - * - * @param filename The filename, may be edited by this function. - * @return The dirname, it is either `filename` or, - * if `filename` is `NULL` or does no contain a - * non-trailing slash, a statically allocationed - * string, so it must not freed or edited. - */ -char* cleanname(char* filename) -{ -#define SLASH(c) (((c) == '/') || !(c)) -#define UNSLASH_END() if ((w > filename + 1) && (w[-1] == '/')) *--w = 0 -#define DOTS(n) ((r[0] == '.') && (r[n - 1] == '.') && SLASH(r[n])) - - size_t parts = 0; - int start; - char* w; - char* r; - - if ((filename == NULL) || !*filename) - return "."; - - /* Remove unnecessary slashes and '.' directory components. */ - for (w = r = filename, start = 1; *r; r++) - if (*r == '/') - { - if ((w == filename) || (w[-1] != '/')) - *w++ = '/'; - start = 1; - } - else if (start && DOTS(1)) - r += r[1] ? 1 : 0; - else - *w++ = *r, start = 0; - UNSLASH_END(); - if (w == filename) - *w++ = '.'; - *w = 0; - - /* Resolve '..' directory components. */ - for (w = r = filename, start = 1; *r; r++) - if (*r == '/') - *w++ = '/', start = 1, parts++; - else if (start && DOTS(2)) - { - if (!parts) - w = stpcpy(w, r[2] ? "../" : ".."); - r += r[2] ? 2 : 1; - if (!parts) - continue; - parts -= (*filename != '/'); - if (w > filename + 1) - do *--w = 0; - while (w[-1] != '/'); - } - else - *w++ = *r, start = 0; - UNSLASH_END(); - if (!*filename) - w = filename, *w++ = '/'; - *w = 0; - - return filename; -} - diff --git a/src/libgen/basename_xpg.c b/src/libgen/basename_xpg.c new file mode 100644 index 0000000..267f3e2 --- /dev/null +++ b/src/libgen/basename_xpg.c @@ -0,0 +1,43 @@ +/** + * slibc — Yet another C library + * Copyright © 2015 Mattias Andrée (maandree@member.fsf.org) + * + * 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 3 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, see . + */ +#include +#include + + + +/** + * Get the basename of a filename, remove + * trailing slashes. + * + * @param filename The filename, may be edited by this function. + * @return The basename, it is either a substring + * of `filename` or, if `filename` is `NULL` + * or is empty, a statically allocationed string, + * so it must not freed or edited. + */ +char* __xpg_basename(char* filename) +{ + char* r = __gnu_basename(filename); + char* p; + if (strcmp(r, ".")) + for (p = r + 1; *p; p++) + if (*p == '/') + *p = 0; + return r; +} + diff --git a/src/libgen/cleanname.c b/src/libgen/cleanname.c new file mode 100644 index 0000000..db542cc --- /dev/null +++ b/src/libgen/cleanname.c @@ -0,0 +1,102 @@ +/** + * slibc — Yet another C library + * Copyright © 2015 Mattias Andrée (maandree@member.fsf.org) + * + * 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 3 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, see . + */ +#include +#include +#include + + + +/** + * Removes all trailing slashes (that is not the first character + * in the filename,), all duplicate slashes, all '.' directory + * components, and when possible using only lexical analysis, + * resolves '..' directory components. + * + * '..' directory components that should resolve up beyond '/', + * are removed. Note that this can in fact mean that the resulting + * path is not the same file if the processes is `chroot`:ed. + * Additionally, and more important, there is no consideration for + * symbolic links. For example, '/a/b/c/..' resolves to '/a/b', + * but if any of the directors are symbolic links, the real path + * is not necessarily '/a/b'. + * + * This is a slibc extension. + * + * @param filename The filename, may be edited by this function. + * @return The dirname, it is either `filename` or, + * if `filename` is `NULL` or does no contain a + * non-trailing slash, a statically allocationed + * string, so it must not freed or edited. + */ +char* cleanname(char* filename) +{ +#define SLASH(c) (((c) == '/') || !(c)) +#define UNSLASH_END() if ((w > filename + 1) && (w[-1] == '/')) *--w = 0 +#define DOTS(n) ((r[0] == '.') && (r[n - 1] == '.') && SLASH(r[n])) + + size_t parts = 0; + int start; + char* w; + char* r; + + if ((filename == NULL) || !*filename) + return "."; + + /* Remove unnecessary slashes and '.' directory components. */ + for (w = r = filename, start = 1; *r; r++) + if (*r == '/') + { + if ((w == filename) || (w[-1] != '/')) + *w++ = '/'; + start = 1; + } + else if (start && DOTS(1)) + r += r[1] ? 1 : 0; + else + *w++ = *r, start = 0; + UNSLASH_END(); + if (w == filename) + *w++ = '.'; + *w = 0; + + /* Resolve '..' directory components. */ + for (w = r = filename, start = 1; *r; r++) + if (*r == '/') + *w++ = '/', start = 1, parts++; + else if (start && DOTS(2)) + { + if (!parts) + w = stpcpy(w, r[2] ? "../" : ".."); + r += r[2] ? 2 : 1; + if (!parts) + continue; + parts -= (*filename != '/'); + if (w > filename + 1) + do *--w = 0; + while (w[-1] != '/'); + } + else + *w++ = *r, start = 0; + UNSLASH_END(); + if (!*filename) + w = filename, *w++ = '/'; + *w = 0; + + return filename; +} + diff --git a/src/libgen/dirname.c b/src/libgen/dirname.c new file mode 100644 index 0000000..3200b07 --- /dev/null +++ b/src/libgen/dirname.c @@ -0,0 +1,51 @@ +/** + * slibc — Yet another C library + * Copyright © 2015 Mattias Andrée (maandree@member.fsf.org) + * + * 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 3 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, see . + */ +#include +#include + + + +/** + * Get the dirname of a filename. + * + * @param filename The filename, may be edited by this function. + * @return The dirname, it is either a substring + * of `filename` or, if `filename` is `NULL` + * or does no contain a non-trailing slash, + * a statically allocationed string, so it + * must not freed or edited. + */ +char* dirname(char* filename) +{ + int have_nonslash = 0; + char* last_slash = NULL; + char c, d; + if ((filename == NULL) || (!*filename)) + return "."; + for (; (c = *filename); filename++) + { + d = filename[1]; + have_nonslash |= c - '/'; + if ((c == '/') && d && (d != '/')) + last_slash = filename; + } + if (!have_nonslash) return "/"; + if (last_slash == NULL) return "."; + return *last_slash = 0, filename; +} + diff --git a/src/string/basename_gnu.c b/src/string/basename_gnu.c new file mode 100644 index 0000000..6fb474a --- /dev/null +++ b/src/string/basename_gnu.c @@ -0,0 +1,52 @@ +/** + * slibc — Yet another C library + * Copyright © 2015 Mattias Andrée (maandree@member.fsf.org) + * + * 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 3 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, see . + */ +#include +#include + + +# pragma GCC diagnostic ignored "-Wdiscarded-qualifiers" + + + +/** + * Get the basename of a filename. + * + * This is a GNU extension, include + * to override it with the XPG-compliant implementation. + * + * @param filename The filename. + * @return The basename, it is either a substring + * of `filename` or, if `filename` is `NULL` + * or is empty, a statically allocationed string, + * so it must not freed or edited. + */ +char* __gnu_basename(const char* filename) +{ + char* r = filename; + char last = '/'; + if (filename == NULL) + return "."; + while (*filename) + { + if ((*filename != '/') && (last == '/')) + r = filename; + last = *filename++; + } + return r; +} + -- cgit v1.2.3-70-g09d2