summaryrefslogtreecommitdiff
path: root/mcon/U/d_getpwent.U
diff options
context:
space:
mode:
authorManoj Srivastava <srivasta@golden-gryphon.com>2014-04-27 18:05:39 -0700
committerManoj Srivastava <srivasta@golden-gryphon.com>2014-04-27 18:05:39 -0700
commit7d4c02d5c9108aa413fbb0ffa1dc8a39bc5f54a1 (patch)
tree2abb9ad01d397bc1e208f57f528c1ec529761392 /mcon/U/d_getpwent.U
parent5c913c35c09a82eead2c07534baa709a5dead3e7 (diff)
parent8f5e5726134ce5b4bd436b16f367796d851df553 (diff)
Merge branch 'upstream'
Signed-off-by: Manoj Srivastava <srivasta@golden-gryphon.com> Conflicts: jmake/jmake.man
Diffstat (limited to 'mcon/U/d_getpwent.U')
-rw-r--r--mcon/U/d_getpwent.U28
1 files changed, 15 insertions, 13 deletions
diff --git a/mcon/U/d_getpwent.U b/mcon/U/d_getpwent.U
index 10ba09b..f7cc291 100644
--- a/mcon/U/d_getpwent.U
+++ b/mcon/U/d_getpwent.U
@@ -1,18 +1,18 @@
-?RCS: $Id: d_getpwent.U 1 2006-08-24 12:32:52Z rmanfredi $
+?RCS: $Id: d_getpwent.U 167 2013-05-08 17:58:00Z rmanfredi $
?RCS:
?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
?RCS:
-?RCS: You may redistribute only under the terms of the Artistic Licence,
+?RCS: You may redistribute only under the terms of the Artistic License,
?RCS: as specified in the README file that comes with the distribution.
?RCS: You may reuse parts of this distribution only within the terms of
-?RCS: that same Artistic Licence; a copy of which may be found at the root
+?RCS: that same Artistic License; a copy of which may be found at the root
?RCS: of the source tree for dist 4.0.
?RCS:
?RCS: $Log: d_getpwent.U,v $
?RCS: Revision 3.0 1993/08/18 12:06:17 ram
?RCS: Baseline for dist 3.0 netwide release.
?RCS:
-?MAKE:d_getpwent: Csym Setvar
+?MAKE:d_getpwent: Trylink cat
?MAKE: -pick add $@ %<
?S:d_getpwent:
?S: This variable conditionally defines the HAS_GETPWENT symbol, which
@@ -27,14 +27,16 @@
?H:.
?LINT:set d_getpwent
: see if there is a getpwent
-echo " "
-if set getpwent val -f d_getpwent; eval $csym; $val; then
- echo "getpwent() found." >&4
- val="$define"
-else
- echo "No getpwent() found -- will use getpw() instead." >&4
- val="$undef"
-fi
+$cat >try.c <<EOC
+#include <pwd.h>
+int main(void)
+{
+ struct passwd pw;
+ pw = *getpwent();
+ return pw.pw_name ? 0 : 1;
+}
+EOC
+cyn=getpwent
set d_getpwent
-eval $setvar
+eval $trylink