moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove Cygwin support 

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2012-12-16 22:03:51 +10:00
parent 23f93118d0
commit 5aaf5bcf83
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -309,10 +309,6 @@ case "${host_os}" in
SIZECMD="stat -f %z" SIZECMD="stat -f %z"
SEDINPLACE="sed -i \"\"" SEDINPLACE="sed -i \"\""
;; ;;
cygwin*)
host_os_cygwin=yes
AC_DEFINE([CYGWIN], [1], [Define if host OS is cygwin])
;;
darwin*) darwin*)
host_os_darwin=yes host_os_darwin=yes
INODECMD="/usr/bin/stat -f '%i %n'" INODECMD="/usr/bin/stat -f '%i %n'"
@ -324,7 +320,6 @@ case "${host_os}" in
;; ;;
esac esac
AM_CONDITIONAL([CYGWIN], test "x$host_os_cygwin" = "xyes")
AM_CONDITIONAL([DARWIN], test "x$host_os_darwin" = "xyes") AM_CONDITIONAL([DARWIN], test "x$host_os_darwin" = "xyes")
AC_PATH_PROGS([DUPATH], [du], [du], [/usr/bin$PATH_SEPARATOR/bin] ) AC_PATH_PROGS([DUPATH], [du], [du], [/usr/bin$PATH_SEPARATOR/bin] )
AC_SUBST(INODECMD) AC_SUBST(INODECMD)

5
src/pacman/pacman.c
View File

@ -758,8 +758,7 @@ int main(int argc, char *argv[])
size_t i; size_t i;
struct sigaction new_action, old_action; struct sigaction new_action, old_action;
const int signals[] = { SIGHUP, SIGINT, SIGTERM, SIGSEGV }; const int signals[] = { SIGHUP, SIGINT, SIGTERM, SIGSEGV };
#if defined(HAVE_GETEUID) && !defined(CYGWIN) #if defined(HAVE_GETEUID)
/* geteuid undefined in CYGWIN */
uid_t myuid = geteuid(); uid_t myuid = geteuid();
#endif #endif
@ -881,7 +880,7 @@ int main(int argc, char *argv[])
config->logmask &= ~ALPM_LOG_WARNING; config->logmask &= ~ALPM_LOG_WARNING;
} }
#if defined(HAVE_GETEUID) && !defined(CYGWIN) #if defined(HAVE_GETEUID)
/* check if we have sufficient permission for the requested operation */ /* check if we have sufficient permission for the requested operation */
if(myuid > 0 && needs_root()) { if(myuid > 0 && needs_root()) {
pm_printf(ALPM_LOG_ERROR, _("you cannot perform this operation unless you are root.\n")); pm_printf(ALPM_LOG_ERROR, _("you cannot perform this operation unless you are root.\n"));