X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ftmpdir.c;h=0170d213d456a9790b14a69dd0cac7c3fb436f12;hb=cc7a4e12a15c81018321fdf653c081cb42cf05b3;hp=f5982ed55996d26a6998ee48708dcf80a43b65af;hpb=57fdfd3f8ec62b105c53bcdf6f127c35c7fe7391;p=gnulib.git diff --git a/lib/tmpdir.c b/lib/tmpdir.c index f5982ed55..0170d213d 100644 --- a/lib/tmpdir.c +++ b/lib/tmpdir.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1999, 2001-2002, 2006 Free Software Foundation, Inc. +/* Copyright (C) 1999, 2001-2002, 2006, 2009-2010 Free Software Foundation, + Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify @@ -76,7 +77,7 @@ direxists (const char *dir) enough space in TMPL. */ int path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx, - bool try_tmpdir) + bool try_tmpdir) { const char *d; size_t dlen, plen; @@ -90,35 +91,35 @@ path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx, { plen = strlen (pfx); if (plen > 5) - plen = 5; + plen = 5; } if (try_tmpdir) { d = __secure_getenv ("TMPDIR"); if (d != NULL && direxists (d)) - dir = d; + dir = d; else if (dir != NULL && direxists (dir)) - /* nothing */ ; + /* nothing */ ; else - dir = NULL; + dir = NULL; } if (dir == NULL) { if (direxists (P_tmpdir)) - dir = P_tmpdir; + dir = P_tmpdir; else if (strcmp (P_tmpdir, "/tmp") != 0 && direxists ("/tmp")) - dir = "/tmp"; + dir = "/tmp"; else - { - __set_errno (ENOENT); - return -1; - } + { + __set_errno (ENOENT); + return -1; + } } dlen = strlen (dir); while (dlen >= 1 && ISSLASH (dir[dlen - 1])) - dlen--; /* remove trailing slashes */ + dlen--; /* remove trailing slashes */ /* check we have room for "${dir}/${pfx}XXXXXX\0" */ if (tmpl_len < dlen + 1 + plen + 6 + 1)