Make it possible to specify scope of a variable to be erased or tested. Also make sure set exits with a non-zero exit status when erasing fails.

darcs-hash:20060604201451-ac50b-4ea0212c513b33be40559dfe8d65c1446c53f682.gz

1 files changed, 8 insertions, 3 deletions

diff --git a/env.h b/env.h
index 69679577..27a7bbfb 100644
--- a/env.h
+++ b/env.h
@@ -91,16 +91,21 @@ wchar_t *env_get( const wchar_t *key );
 /**
    Returns 1 if the specified key exists. This can't be reliable done
    using env_get, since env_get returns null for 0-element arrays
+
+   \param key The name of the variable to remove
+   \param mode the scope to search in. All scopes are searched if unset
 */
-int env_exist( const wchar_t *key );
+int env_exist( const wchar_t *key, int mode );
 
 /**
    Remove environemnt variable
    
    \param key The name of the variable to remove
-   \param mode should be ENV_USER if this is a remove request from the user, 0 otherwise. If this is a user request, read-only variables can not be removed.
+   \param mode should be ENV_USER if this is a remove request from the user, 0 otherwise. If this is a user request, read-only variables can not be removed. The mode may also specify the scope of the variable that should be erased.
+
+   \return zero if the variable existed, and non-zero if the variable did not exist
 */
-void env_remove( const wchar_t *key, int mode );
+int env_remove( const wchar_t *key, int mode );
 
 /**
   Push the variable stack. Used for implementing local variables for functions and for-loops.