r1723: *** empty log message ***

[uffi.git] / examples / getenv.cl

diff --git a/examples/getenv.cl b/examples/getenv.cl
index c6da2a0c9bff1cefaaa8014f708f7e920feae498..b3d620ec13648fdda2f41a483dc03de771a4cc83 100644 (file)
--- a/examples/getenv.cl
+++ b/examples/getenv.cl
@@ -5,26 +5,15 @@
 ;;;; Name:          getenv.cl
 ;;;; Purpose:       UFFI Example file to get environment variable
 ;;;; Programmer:    Kevin M. Rosenberg
-;;;; Date Started:  Mar 2002
+;;;; Date Started:  Feb 2002
 ;;;;
-;;;; Copyright (c) 2002 Kevin M. Rosenberg
+;;;; $Id: getenv.cl,v 1.9 2002/04/02 23:27:05 kevin Exp $
 ;;;;
-;;;; $Id: getenv.cl,v 1.5 2002/03/10 11:13:07 kevin Exp $
+;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
-;;;; This file is part of UFFI. 
-;;;;
-;;;; UFFI is free software; you can redistribute it and/or modify
-;;;; it under the terms of the GNU General Public License (version 2) as
-;;;; published by the Free Software Foundation.
-;;;;
-;;;; UFFI is distributed in the hope that it will be useful,
-;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;;; GNU General Public License for more details.
-;;;;
-;;;; You should have received a copy of the GNU General Public License
-;;;; along with UFFI; if not, write to the Free Software Foundation, Inc.,
-;;;; 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+;;;; UFFI users are granted the rights to distribute and use this software
+;;;; as governed by the terms of the Lisp Lesser GNU Public License
+;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
 (in-package :cl-user)
@@ -38,13 +27,21 @@
   "Returns an environment variable, or NIL if it does not exist"
   (check-type key string)
   (uffi:with-cstring (key-native key)
-    (let ((value-cstring (c-getenv key-native)))
-      (uffi:convert-from-cstring value-cstring))))
+    (uffi:convert-from-cstring (c-getenv key-native))))
     
-#+test-uffi
+#+examples-uffi
 (progn
   (flet ((print-results (str)
           (format t "~&(getenv ~S) => ~S" str (my-getenv str))))
     (print-results "USER")
     (print-results "_FOO_")))
 
+
+#+test-uffi
+(progn
+  (util.test:test (my-getenv "_FOO_") nil :fail-info "Error retrieving non-existent getenv")
+  (util.test:test (and (stringp (my-getenv "USER"))
+                      (< 0 (length (my-getenv "USER"))))
+                 t :fail-info "Error retrieving getenv")
+)
+