diff options
| author | Simo Sorce <idra@samba.org> | 2001-11-12 00:53:34 +0000 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2001-11-12 00:53:34 +0000 |
| commit | 84244244710790f2058ee90b2dc80e9c252841dd (patch) | |
| tree | 34900507eeb6721b52d3a02ab9a7673c8615bec8 /source3/lib/util.c | |
| parent | 5abe3932cc9211263b2a93d58cdddb8de2d6f677 (diff) | |
| download | samba-84244244710790f2058ee90b2dc80e9c252841dd.tar.gz samba-84244244710790f2058ee90b2dc80e9c252841dd.tar.bz2 samba-84244244710790f2058ee90b2dc80e9c252841dd.zip | |
some bugfix and new functions,
modified mangle.c to use mosltly acnv_????() functions.
this should make also build farm happy
(This used to be commit 8bb5cb27c2012b8967482255d48a1b48d3acd9db)
Diffstat (limited to 'source3/lib/util.c')
| -rw-r--r-- | source3/lib/util.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c index e2a5fe10d0..02397dd4c4 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -4,6 +4,7 @@ Samba utility functions Copyright (C) Andrew Tridgell 1992-1998 Copyright (C) Jeremy Allison 2001 + Copyright (C) Simo Sorce 2001 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 @@ -429,7 +430,7 @@ smb_ucs2_t *unix_clean_path(const smb_ucs2_t *s) smb_ucs2_t *ns; smb_ucs2_t *p, *r, *t; - DEBUG(3, ("unix_clean_name_w\n")); /* [%unicode]\n")); */ + DEBUG(3, ("unix_clean_path\n")); /* [%unicode]\n")); */ /* convert '\' to '/' */ ns = strdup_w(s); @@ -450,7 +451,7 @@ smb_ucs2_t *unix_clean_path(const smb_ucs2_t *s) /* reduce any /../ */ t = ns; - while ((r = strstr_wa(t, "/..")) != NULL) { + while ((r = strstr_wa(t, "/.."))) { t = &(r[3]); if (*t == UCS2_CHAR('/') || *t == 0) { *r = 0; |