diff options
| author | MySQL Team <mysql@php.net> | 2001-06-01 20:07:26 +0000 |
|---|---|---|
| committer | MySQL Team <mysql@php.net> | 2001-06-01 20:07:26 +0000 |
| commit | e8cbbc0637cb27c6fda64940a9138e08060475f8 (patch) | |
| tree | f6353232aba5ae05c8f4779865cd742dc392b181 /ext/mysql/libmysql/mf_pack.c | |
| parent | 304ac03be434eecf6edc1f025c455e9089f8af37 (diff) | |
| download | php-git-e8cbbc0637cb27c6fda64940a9138e08060475f8.tar.gz | |
Upgrade ext/mysql/libmysql to version 3.23.39. No major changes -
portability fixes.
Also add configure test for HAVE_INT_8_16_32 which should solve
compilation problems on AIX.
Diffstat (limited to 'ext/mysql/libmysql/mf_pack.c')
| -rw-r--r-- | ext/mysql/libmysql/mf_pack.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ext/mysql/libmysql/mf_pack.c b/ext/mysql/libmysql/mf_pack.c index a6ab070870..b6b079bdac 100644 --- a/ext/mysql/libmysql/mf_pack.c +++ b/ext/mysql/libmysql/mf_pack.c @@ -222,11 +222,16 @@ void symdirget(char *dir) *pos++=temp; *pos=0; /* Restore old filename */ if (fp) { - if (fgets(buff, sizeof(buff), fp)) + if (fgets(buff, sizeof(buff)-1, fp)) { for (pos=strend(buff); pos > buff && (iscntrl(pos[-1]) || isspace(pos[-1])) ; pos --); + + /* Ensure that the symlink ends with the directory symbol */ + if (pos == buff || pos[-1] != FN_LIBCHAR) + *pos++=FN_LIBCHAR; + strmake(dir,buff, (uint) (pos-buff)); } my_fclose(fp,MYF(0)); |