claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Test and workaround another Unixism - pwd.h, getuid/getpwuid.

Browse Source
This commit is contained in:
rocky
2005-02-03 08:07:24 +00:00
parent 5bd3a51e03
commit f0708a5264
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@@ -19,7 +19,7 @@ define(RELEASE_NUM, 73)
define(CDIO_VERSION_STR, 0.$1cvs) define(CDIO_VERSION_STR, 0.$1cvs)
AC_PREREQ(2.52) AC_PREREQ(2.52)
AC_REVISION([$Id: configure.ac,v 1.139 2005/02/03 07:52:15 rocky Exp $])dnl AC_REVISION([$Id: configure.ac,v 1.140 2005/02/03 08:07:24 rocky Exp $])dnl
AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM)) AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM))
AC_CONFIG_SRCDIR(src/cd-info.c) AC_CONFIG_SRCDIR(src/cd-info.c)
@@ -156,7 +156,7 @@ AM_PATH_LIBPOPT(,
dnl headers dnl headers
AC_HEADER_STDC AC_HEADER_STDC
AC_CHECK_HEADERS(errno.h fcntl.h glob.h) AC_CHECK_HEADERS(errno.h fcntl.h glob.h pwd.h)
AC_CHECK_HEADERS(stdarg.h stdbool.h stdio.h sys/cdio.h sys/param.h) AC_CHECK_HEADERS(stdarg.h stdbool.h stdio.h sys/cdio.h sys/param.h)
AC_SUBST(SBPCD_H) AC_SUBST(SBPCD_H)
@@ -413,7 +413,7 @@ AC_DEFINE_UNQUOTED(LIBCDIO_SOURCE_PATH, "$LIBCDIO_SOURCE_PATH",
AC_SUBST(LIBCDIO_SOURCE_PATH) AC_SUBST(LIBCDIO_SOURCE_PATH)
AC_CHECK_FUNCS( [bzero ftruncate lstat memcpy memset snprintf \ AC_CHECK_FUNCS( [bzero ftruncate lstat memcpy memset snprintf \
tzset vsnprintf] ) tzset vsnprintf getpwuid geteuid] )
AC_CHECK_MEMBER([struct tm.tm_gmtoff], AC_CHECK_MEMBER([struct tm.tm_gmtoff],
[AC_DEFINE(HAVE_TM_GMTOFF, 1, [AC_DEFINE(HAVE_TM_GMTOFF, 1,

15
lib/cdda_interface/scan_devices.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: scan_devices.c,v 1.19 2005/02/03 07:52:15 rocky Exp $ $Id: scan_devices.c,v 1.20 2005/02/03 08:07:24 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1998 Monty xiphmont@mit.edu Copyright (C) 1998 Monty xiphmont@mit.edu
@@ -31,8 +31,14 @@
#include "cdio/scsi_mmc.h" #include "cdio/scsi_mmc.h"
#include <limits.h> #include <limits.h>
#include <ctype.h> #include <ctype.h>
#ifdef HAVE_PWD_H
#include <pwd.h> #include <pwd.h>
#endif
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h> #include <sys/stat.h>
#endif
#define MAX_DEV_LEN 20 /* Safe because strings only come from below */ #define MAX_DEV_LEN 20 /* Safe because strings only come from below */
/* must be absolute paths! */ /* must be absolute paths! */
@@ -110,11 +116,16 @@ cdio_cddap_find_a_cdrom(int messagedest, char **ppsz_messages){
i++; i++;
} }
{ {
#if defined(HAVE_GETPWUID) && defined(HAVE_GETEUID)
struct passwd *temp; struct passwd *temp;
temp=getpwuid(geteuid()); temp=getpwuid(geteuid());
idmessage(messagedest, ppsz_messages, idmessage(messagedest, ppsz_messages,
"\n\nNo cdrom drives accessible to %s found.\n", "\n\nNo cdrom drives accessible to %s found.\n",
temp->pw_name); temp->pw_name);
#else
idmessage(messagedest, ppsz_messages,
"\n\nNo cdrom drives accessible found.\n", NULL);
#endif
} }
return(NULL); return(NULL);
} }
@@ -128,7 +139,7 @@ cdda_identify(const char *psz_device, int messagedest,char **ppsz_messages)
idmessage(messagedest, ppsz_messages, "Checking %s for cdrom...", idmessage(messagedest, ppsz_messages, "Checking %s for cdrom...",
psz_device); psz_device);
else else
idmessage(messagedest, ppsz_messages, "Checking for cdrom...", NULL ); idmessage(messagedest, ppsz_messages, "Checking for cdrom...", NULL);
d=cdio_cddap_identify_cooked(psz_device, messagedest, ppsz_messages); d=cdio_cddap_identify_cooked(psz_device, messagedest, ppsz_messages);