diff options
| author | Andi Gutmans <andi@php.net> | 2000-08-22 17:59:35 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2000-08-22 17:59:35 +0000 |
| commit | 0222b7ab416d845abcd3925b3da47fa2d7ed238d (patch) | |
| tree | 38cbb73fda38196612fddffda4d803003a86b568 /ext/mysql/libmysql/mf_path.c | |
| parent | 60676f19a5f5425c4375d8ba60e8bd07016ba562 (diff) | |
| download | php-git-0222b7ab416d845abcd3925b3da47fa2d7ed238d.tar.gz | |
- Try and revert libmysql for 4.0.2
Diffstat (limited to 'ext/mysql/libmysql/mf_path.c')
| -rw-r--r-- | ext/mysql/libmysql/mf_path.c | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/ext/mysql/libmysql/mf_path.c b/ext/mysql/libmysql/mf_path.c index f7dcf34e6b..c51a79e238 100644 --- a/ext/mysql/libmysql/mf_path.c +++ b/ext/mysql/libmysql/mf_path.c @@ -1,19 +1,5 @@ -/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ +/* Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB + This file is public domain and comes with NO WARRANTY of any kind */ #include "mysys_priv.h" #include <m_string.h> @@ -46,7 +32,7 @@ my_string my_path(my_string to, const char *progname, if (!test_if_hard_path(to)) { if (!my_getwd(curr_dir,FN_REFLEN,MYF(0))) - bchange(to,0,curr_dir, (uint) strlen(curr_dir), (uint) strlen(to)+1); + bchange(to,0,curr_dir,strlen(curr_dir),strlen(to)+1); } } else @@ -74,7 +60,7 @@ my_string my_path(my_string to, const char *progname, /* test if file without filename is found in path */ /* Returns to if found and to has dirpart if found, else NullS */ -#if defined(MSDOS) || defined(__WIN__) +#if defined(MSDOS) || defined(__WIN32__) #define F_OK 0 #define PATH_SEP ';' #define PROGRAM_EXTENSION ".exe" @@ -107,7 +93,7 @@ static char *find_file_in_path(char *to, const char *name) } } } -#ifdef __WIN__ +#ifdef __WIN32__ to[0]=FN_CURLIB; strxmov(to+1,dir,name,ext,NullS); if (!access(to,F_OK)) /* Test in current dir */ |