[llvm-commits] CVS: llvm/test/Programs/MultiSource/Applications/siod/Makefile README-LLVM.txt slibu.c

[Brian Gaeke]

Changes in directory llvm/test/Programs/MultiSource/Applications/siod:

Makefile updated: 1.3 -> 1.4
README-LLVM.txt updated: 1.1 -> 1.2
slibu.c updated: 1.3 -> 1.4

---
Log message:

Make siod compile on solaris/sparc; update README

---
Diffs of the changes:  (+7 -22)

Index: llvm/test/Programs/MultiSource/Applications/siod/Makefile
diff -u llvm/test/Programs/MultiSource/Applications/siod/Makefile:1.3 llvm/test/Programs/MultiSource/Applications/siod/Makefile:1.4
--- llvm/test/Programs/MultiSource/Applications/siod/Makefile:1.3	Sun Feb 29 21:33:34 2004
+++ llvm/test/Programs/MultiSource/Applications/siod/Makefile	Fri Mar 12 15:13:20 2004
@@ -2,7 +2,7 @@
 LEVEL = ../../../../..
 PROG     = siod
 CPPFLAGS = -D__USE_MISC -D__USE_GNU -D__USE_SVID -D__USE_XOPEN_EXTENDED -D__USE_XOPEN -Dunix
-LDFLAGS  = -lm -ldl -lcrypt
+LDFLAGS  = -lm -ldl
 
 RUN_OPTIONS = -v1 $(BUILD_SRC_DIR)/test.scm
 


Index: llvm/test/Programs/MultiSource/Applications/siod/README-LLVM.txt
diff -u llvm/test/Programs/MultiSource/Applications/siod/README-LLVM.txt:1.1 llvm/test/Programs/MultiSource/Applications/siod/README-LLVM.txt:1.2
--- llvm/test/Programs/MultiSource/Applications/siod/README-LLVM.txt:1.1	Fri Oct 17 13:48:45 2003
+++ llvm/test/Programs/MultiSource/Applications/siod/README-LLVM.txt	Fri Mar 12 15:13:24 2004
@@ -20,8 +20,11 @@
 the thing to work, and gave it a small MultiSource-friendly Makefile. I
 also #ifdefed out the "Evaluation took ... seconds" message that gets
 printed out after every top-level REPL expression, in slib.c (search for
-"ifdef STATISTICS"). I also renamed lchmod to l_chmod to allow it to
-compile natively under Redhat 8...
+"ifdef STATISTICS").
+
+We also renamed lchmod to l_chmod, ripped out lchown() and lcrypt(),
+and the reference to putpwent(). We provided a default definition for
+PATH_MAX.
 
 
 WHAT ELSE NEEDS TO BE DONE?


Index: llvm/test/Programs/MultiSource/Applications/siod/slibu.c
diff -u llvm/test/Programs/MultiSource/Applications/siod/slibu.c:1.3 llvm/test/Programs/MultiSource/Applications/siod/slibu.c:1.4
--- llvm/test/Programs/MultiSource/Applications/siod/slibu.c:1.3	Tue Dec 16 18:09:51 2003
+++ llvm/test/Programs/MultiSource/Applications/siod/slibu.c	Fri Mar 12 15:13:25 2004
@@ -55,17 +55,11 @@
 #endif
 
 #if defined(sun)
-#include <crypt.h>
 #include <limits.h>
 #include <sys/mkdev.h>
 #include <fcntl.h>
 #endif
 
-#if defined(linux) && defined(PPC)
-/* I know, this should be defined(NEED_CRYPT_H) */
-#include <crypt.h>
-#endif
-
 #if defined(sgi)
 #include <limits.h>
 #endif
@@ -104,7 +98,7 @@
 
 static void init_slibu_version(void)
 {setvar(cintern("*slibu-version*"),
-	cintern("$Id: slibu.c,v 1.3 2003/12/17 00:09:51 gaeke Exp $"),
+	cintern("$Id: slibu.c,v 1.4 2004/03/12 21:13:25 gaeke Exp $"),
 	NIL);}
 
 
@@ -140,17 +134,6 @@
 {return(flocons(getgid()));}
 #endif
 
-#ifdef unix
-
-LISP lcrypt(LISP key,LISP salt)
-{char *result;
- if ((result = crypt(get_c_string(key),get_c_string(salt))))
-   return(strcons(strlen(result),result));
- else
-   return(NIL);}
-
-#endif
-
 #if defined(unix) || defined(WIN32)
 
 #if defined(WIN32)
@@ -2143,7 +2126,6 @@
  init_subr_0("getcwd",lgetcwd);
 #endif
 #ifdef unix
- init_subr_2("crypt",lcrypt);
  init_subr_1("getpwuid",lgetpwuid);
  init_subr_1("getpwnam",lgetpwnam);
  init_subr_0("getpwent",lgetpwent);