apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject cvs commit: apr/user/unix userinfo.c
Date Sun, 28 Jan 2001 00:29:19 GMT
rbb         01/01/27 16:29:19

  Modified:    .        configure.in
               include  apr_file_info.h apr_user.h
               user/unix userinfo.c
  Log:
  Get the new userinfo stuff to compile cleanly.
  
  Revision  Changes    Path
  1.216     +1 -0      apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr/configure.in,v
  retrieving revision 1.215
  retrieving revision 1.216
  diff -u -d -b -w -u -r1.215 -r1.216
  --- configure.in	2001/01/24 19:49:05	1.215
  +++ configure.in	2001/01/28 00:29:18	1.216
  @@ -626,6 +626,7 @@
   
   dnl #----------------------------- Checking for missing POSIX thread functions
   AC_CHECK_FUNCS(getpwnam_r)
  +AC_CHECK_FUNCS(getpwuid_r)
   
   dnl #----------------------------- Checking for Processes
   echo $ac_n "${nl}Checking for Processes...${nl}"
  
  
  
  1.8       +1 -5      apr/include/apr_file_info.h
  
  Index: apr_file_info.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_file_info.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -d -b -w -u -r1.7 -r1.8
  --- apr_file_info.h	2001/01/24 18:24:06	1.7
  +++ apr_file_info.h	2001/01/28 00:29:18	1.8
  @@ -56,6 +56,7 @@
   #define APR_FILE_INFO_H
   
   #include "apr.h"
  +#include "apr_user.h"
   #include "apr_pools.h"
   #include "apr_time.h"
   #include "apr_errno.h"
  @@ -108,11 +109,6 @@
    * @defvar apr_fileperms_t
    */
   typedef apr_int32_t               apr_fileperms_t;
  -/**
  - * Structure for determining file owner.
  - * @defvar apr_uid_t
  - */
  -typedef uid_t                     apr_uid_t;
   /**
    * Structure for determining the group that owns the file.
    * @defvar apr_gid_t
  
  
  
  1.4       +7 -1      apr/include/apr_user.h
  
  Index: apr_user.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_user.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -d -b -w -u -r1.3 -r1.4
  --- apr_user.h	2001/01/28 00:04:01	1.3
  +++ apr_user.h	2001/01/28 00:29:18	1.4
  @@ -69,6 +69,12 @@
    * @package APR user id services
    */
   
  +/**
  + * Structure for determining file owner.
  + * @defvar apr_uid_t
  + */
  +typedef uid_t                     apr_uid_t;
  +
   /***
    * Get the user name for a specified userid
    * @param dirname Pointer to new string containing user name (on output)
  @@ -77,7 +83,7 @@
    * @deffunc apr_status_t apr_get_username(char **username, apr_uid_t userid, apr_pool_t
*p)
    * @tip This function is available only if APR_HAS_USER is defined.
    */
  -APR_DECLARE(apr_status_t) apr_get_userid(char **username, apr_uid_t userid, apr_pool_t
*p);
  +APR_DECLARE(apr_status_t) apr_get_username(char **username, apr_uid_t userid, apr_pool_t
*p);
   
   /***
    * Get the home directory for the named user
  
  
  
  1.5       +1 -1      apr/user/unix/userinfo.c
  
  Index: userinfo.c
  ===================================================================
  RCS file: /home/cvs/apr/user/unix/userinfo.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -d -b -w -u -r1.4 -r1.5
  --- userinfo.c	2001/01/28 00:04:03	1.4
  +++ userinfo.c	2001/01/28 00:29:19	1.5
  @@ -83,7 +83,7 @@
   APR_DECLARE(apr_status_t) apr_get_username(char **username, apr_uid_t userid, apr_pool_t
*p)
   {
       struct passwd *pw;
  -#if APR_HAS_THREADS && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETPWNAM_R)
  +#if APR_HAS_THREADS && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETPWUID_R)
       struct passwd pwd;
       char pwbuf[512];
   
  
  
  

Mime
View raw message