X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib_internal%2Fpathinfo-append.c;fp=lib_internal%2Fpathinfo-append.c;h=0000000000000000000000000000000000000000;hb=db5ef3f969fc6ad34aeb5903e44d0049b2e50791;hp=bef46e2b0e122a2fae71060b6c69ada9fd37fc45;hpb=95e2774070e989fe9cf9f48dae5fa054e55e2a3e;p=util-vserver.git diff --git a/lib_internal/pathinfo-append.c b/lib_internal/pathinfo-append.c deleted file mode 100644 index bef46e2..0000000 --- a/lib_internal/pathinfo-append.c +++ /dev/null @@ -1,54 +0,0 @@ -// $Id: pathinfo-append.c 910 2004-02-17 02:33:20Z ensc $ --*- c -*-- - -// Copyright (C) 2004 Enrico Scholz -// -// 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; version 2 of the License. -// -// 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. - - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include "pathinfo.h" -#include "util-mem.h" - -void -PathInfo_append(PathInfo * restrict lhs, - PathInfo const * restrict rhs, - char *buf) -{ - char * ptr = buf; - char const * rhs_ptr = rhs->d; - size_t rhs_len = rhs->l; - - while (lhs->l>1 && lhs->d[lhs->l-1]=='/') --lhs->l; - - if (lhs->l>0) { - while (rhs->l>0 && *rhs_ptr=='/') { - ++rhs_ptr; - --rhs_len; - } - - ptr = Xmemcpy(ptr, lhs->d, lhs->l); - if (ptr[-1]!='/') - ptr = Xmemcpy(ptr, "/", 1); - } -// else if (*rhs_ptr!='/') -// ptr = Xmemcpy(ptr, "/", 1); - - ptr = Xmemcpy(ptr, rhs_ptr, rhs_len+1); - - lhs->d = buf; - lhs->l = ptr-buf-1; -}