cvs: php4(PHP_4_2_0) /win32 grp.h pwd.c pwd.h syslog.h

sterling Thu Apr 4 15:27:25 2002 EDT Modified files: (Branch: PHP_4_2_0) /php4/win32 grp.h pwd.c pwd.h syslog.h Log: mfh

Index: php4/win32/grp.h diff -u php4/win32/grp.h:1.1.1.1 php4/win32/grp.h:1.1.1.1.12.1 --- php4/win32/grp.h:1.1.1.1 Wed Apr 7 17:05:12 1999 +++ php4/win32/grp.h Thu Apr 4 15:27:24 2002 @@ -1,31 +1,26 @@ -/* pwd.h - Try to approximate UN*X's getuser...() functions under MS-DOS. - Copyright (C) 1990 by Thorsten Ohl, td12@ddagsi3.bitnet +/* + +----------------------------------------------------------------------+ + | PHP Version 4 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997-2002 The PHP Group | + +----------------------------------------------------------------------+ + | This source file is subject to version 2.02 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available at through the world-wide-web at | + | http://www.php.net/license/2_02.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Author: Sterling Hughes <sterling@php.net> | + +----------------------------------------------------------------------+ +*/ - 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; either version 1, or (at your option) - any later version. - - 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., 675 Mass Ave, Cambridge, MA 02139, USA. - - $Header: /usr/repository/php4/win32/grp.h,v 1.1.1.1 1999/04/07 21:05:12 zeev Exp $ - */ - -/* This 'implementation' is conjectured from the use of this functions in - the RCS and BASH distributions. Of course these functions don't do too - much useful things under MS-DOS, but using them avoids many "#ifdef - MSDOS" in ported UN*X code ... */ +/* $Id: grp.h,v 1.1.1.1.12.1 2002/04/04 20:27:24 sterling Exp $ */ struct group { - char *gr_name; /* group name */ - char *gr_passwd; /* group password */ - int gr_gid; /* group id */ - char **gr_mem; /* group members */ + char *gr_name; + char *gr_passwd; + int gr_gid; + char **gr_mem; }; Index: php4/win32/pwd.c diff -u php4/win32/pwd.c:1.3 php4/win32/pwd.c:1.3.12.1 --- php4/win32/pwd.c:1.3 Fri Apr 23 20:11:59 1999 +++ php4/win32/pwd.c Thu Apr 4 15:27:24 2002 @@ -1,27 +1,22 @@ -/* pwd.c - Try to approximate UN*X's getuser...() functions under MS-DOS. - Copyright (C) 1990 by Thorsten Ohl, td12@ddagsi3.bitnet +/* + +----------------------------------------------------------------------+ + | PHP Version 4 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997-2002 The PHP Group | + +----------------------------------------------------------------------+ + | This source file is subject to version 2.02 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available at through the world-wide-web at | + | http://www.php.net/license/2_02.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Author: Sterling Hughes <sterling@php.net> | + +----------------------------------------------------------------------+ +*/ - 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; either version 1, or (at your option) - any later version. - - 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., 675 Mass Ave, Cambridge, MA 02139, USA. - - $Header: /usr/repository/php4/win32/pwd.c,v 1.3 1999/04/24 00:11:59 zeev Exp $ - */ - -/* This 'implementation' is conjectured from the use of this functions in - the RCS and BASH distributions. Of course these functions don't do too - much useful things under MS-DOS, but using them avoids many "#ifdef - MSDOS" in ported UN*X code ... */ +/* $Id: pwd.c,v 1.3.12.1 2002/04/04 20:27:24 sterling Exp $ */ #include "php.h" /*php specific */ #define WIN32_LEAN_AND_MEAN @@ -35,40 +30,37 @@ #include "grp.h" #ifndef THREAD_SAFE -static struct passwd pw; /* should we return a malloc()'d structure */ +static struct passwd pwd; #endif -static char *home_dir = "."; /* we feel (no|every)where at home */ + +static char *home_dir = "."; static char *login_shell = "not command.com!"; -struct passwd *getpwnam(char *name) +struct passwd * +getpwnam(char *name) { return (struct passwd *) 0; } -char *getlogin() +char * +getlogin() { static char name[256]; - DWORD dw = 256; - GetUserName(name, &dw); + DWORD max_len = 256; + + GetUserName(name, &max_len); return name; } struct passwd * - getpwuid(int uid) +getpwuid(int user_id) { - pw.pw_name = getlogin(); - pw.pw_dir = home_dir; - pw.pw_shell = login_shell; - pw.pw_uid = 0; + pwd.pw_name = getlogin(); + pwd.pw_dir = home_dir; + pwd.pw_shell = login_shell; + pwd.pw_uid = 0; - return &pw; + return &pwd; } -/* - * Local Variables: - * mode:C - * ChangeLog:ChangeLog - * compile-command:make - * End: - */ Index: php4/win32/pwd.h diff -u php4/win32/pwd.h:1.2 php4/win32/pwd.h:1.2.10.1 --- php4/win32/pwd.h:1.2 Sun Jul 2 19:46:51 2000 +++ php4/win32/pwd.h Thu Apr 4 15:27:24 2002 @@ -1,57 +1,38 @@ -/* pwd.h - Try to approximate UN*X's getuser...() functions under MS-DOS. - Copyright (C) 1990 by Thorsten Ohl, td12@ddagsi3.bitnet - - 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; either version 1, or (at your option) - any later version. - - 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., 675 Mass Ave, Cambridge, MA 02139, USA. +/* + +----------------------------------------------------------------------+ + | PHP Version 4 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997-2002 The PHP Group | + +----------------------------------------------------------------------+ + | This source file is subject to version 2.02 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available at through the world-wide-web at | + | http://www.php.net/license/2_02.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Author: Sterling Hughes <sterling@php.net> | + +----------------------------------------------------------------------+ +*/ - $Header: /usr/repository/php4/win32/pwd.h,v 1.2 2000/07/02 23:46:51 sas Exp $ - */ +/* $Id: pwd.h,v 1.2.10.1 2002/04/04 20:27:24 sterling Exp $ */ -/* This 'implementation' is conjectured from the use of this functions in - the RCS and BASH distributions. Of course these functions don't do too - much useful things under MS-DOS, but using them avoids many "#ifdef - MSDOS" in ported UN*X code ... */ -/* - #define WIN32_LEAN_AND_MEAN - #include <windows.h> - */ #ifndef PWD_H #define PWD_H -#if 0 -/* This is taken care of in Windows-NT/config.h. */ -typedef int uid_t; -#endif struct passwd { - char *pw_name; /* user name */ - char *pw_passwd; /* encrypted password */ - int pw_uid; /* user uid */ - int pw_gid; /* user gid */ - char *pw_comment; /* comment */ - char *pw_gecos; /* Honeywell login info */ - char *pw_dir; /* home directory */ - char *pw_shell; /* default shell */ + char *pw_name; + char *pw_passwd; + int pw_uid; + int pw_gid; + char *pw_comment; + char *pw_gecos; + char *pw_dir; + char *pw_shell; }; extern struct passwd *getpwuid(int); extern struct passwd *getpwnam(char *name); extern char *getlogin(void); #endif -/* - * Local Variables: - * mode:C - * ChangeLog:ChangeLog - * compile-command:make - * End: - */ Index: php4/win32/syslog.h diff -u php4/win32/syslog.h:1.4 php4/win32/syslog.h:1.4.10.1 --- php4/win32/syslog.h:1.4 Sun Jul 2 20:45:21 2000 +++ php4/win32/syslog.h Thu Apr 4 15:27:24 2002 @@ -1,15 +1,22 @@ /* - * This header borrowed from Cygnus GNUwin32 project - * - * Modified for use with functions to map syslog - * calls to EventLog calls on the windows platform - * - * much of this is not used, but here for the sake of - * error free compilation. EventLogs will most likely - * not behave as syslog does, but may be useful anyway. - * much of what syslog does can be emulated here, but - * that will have to be done later. - */ + +----------------------------------------------------------------------+ + | PHP Version 4 | + +----------------------------------------------------------------------+ + | Copyright (c) 1997-2002 The PHP Group | + +----------------------------------------------------------------------+ + | This source file is subject to version 2.02 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available at through the world-wide-web at | + | http://www.php.net/license/2_02.txt. | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Author: Sterling Hughes <sterling@php.net> | + +----------------------------------------------------------------------+ +*/ + +/* $Id: syslog.h,v 1.4.10.1 2002/04/04 20:27:24 sterling Exp $ */ #ifndef SYSLOG_H #define SYSLOG_H @@ -65,8 +72,6 @@ extern void closelog(void); extern void openlog(const char *, int, int); -/* setlogmask not implemented */ -/* extern int setlogmask (int); */ extern void syslog(int, const char *, ...);