Changeset 3285

Timestamp:

May 2, 2007, 1:44:40 AM (18 years ago)

Author:

bird

Message:

Implemented set special *LIBPATH* variables.

File:

• trunk/essentials/app-shells/bash/variables.c (modified) (4 diffs)

trunk/essentials/app-shells/bash/variables.c

@@ -206 +206 @@
 static SHELL_VAR *get_funcname __P((SHELL_VAR *));
 static SHELL_VAR *init_funcname_var __P((void));
+
+#if defined(__OS2__)
+static SHELL_VAR *os2_libpath_assign __P((SHELL_VAR *, char *, arrayind_t));
+static SHELL_VAR *os2_libpath_refresh_value __P((SHELL_VAR *));
+#endif 
 
 static void initialize_dynamic_variables __P((void));
@@ -1367 +1372 @@
 #endif /* PUSHD AND POPD && ARRAY_VARS */
 
+#ifdef __OS2__
+/* LIBPATH stuff */
+# define INCL_BASE
+# include <assert.h>
+# include <os2.h>
+extern APIRET APIENTRY DosQueryHeaderInfo (HMODULE hmod, ULONG ulIndex, PVOID pvBuffer, ULONG cbBuffer, ULONG ulSubFunction);
+# define QHINF_LIBPATHLENGTH 4 /* Gets the libpath length. */
+# define QHINF_LIBPATH       5 /* Gets the entire libpath. */
+
+static SHELL_VAR *os2_libpath_assign (self, value, ind)
+     SHELL_VAR *self;
+     char *value;
+     arrayind_t ind;
+{
+  /* set */
+  ULONG flags;
+  char ch = self->name[0];
+  if (ch == 'B' || ch == 'b')
+    flags = BEGIN_LIBPATH;
+  else if (ch == 'E' || ch == 'e')
+    flags = END_LIBPATH;
+  else if ((ch == 'L' || ch == 'l') && strcmp (self->name, "LIBPATH"))
+    flags = LIBPATHSTRICT;
+  else
+    {
+      assert (0);
+      return (self);
+    }
+  DosSetExtLIBPATH (value, flags);
+
+  /* refresh the value. */
+  return os2_libpath_refresh_value (self);
+}
+    
+static SHELL_VAR *os2_libpath_refresh_value (self)
+     SHELL_VAR *self;
+{
+  VUNSETATTR (self, att_exported);
+
+  /* allocate 2 KB once and assume nobody messes with it.
+    (2KB is a bit too much for LIBPATHSTRICT, but so what.) */
+  if (var_isnull (self))
+    {
+      char *newval = xmalloc (2048);
+      var_setvalue (self, newval);
+    }
+
+  if (!strcmp (self->name, "LIBPATH"))
+    {
+      if (DosQueryHeaderInfo (NULLHANDLE, 0, self->value, 2048, QHINF_LIBPATH))
+        {
+          assert (0);
+          self->value[0] = '\0';
+        }
+    }
+  else
+    {
+      ULONG flags;
+      char ch = self->name[0];
+      if (ch == 'B' || ch == 'b')
+        flags = BEGIN_LIBPATH;
+      else if (ch == 'E' || ch == 'e')
+        flags = END_LIBPATH;
+      else if (ch == 'L' || ch == 'l')
+        {
+          /* The API writes a single value, add '\0'. */
+          memset (self->value, 0, 32);
+          flags = LIBPATHSTRICT;
+        }
+      else
+        assert (0);
+      if (DosQueryExtLIBPATH (self->value, flags))
+        {
+          assert (0);
+          self->value[0] = '\0';
+        }
+    }
+  return self;
+}
+#endif /* __OS2__ */
+
 #if defined (ARRAY_VARS)
 /* We don't want to initialize the group set with a call to getgroups()
@@ -1479 +1565 @@
   v = init_dynamic_array_var ("BASH_LINENO", get_self, null_array_assign, att_noassign|att_nounset);
 #endif
+
+#ifdef __OS2__
+  INIT_DYNAMIC_VAR ("BEGINLIBPATH", (char *)NULL, NULL, os2_libpath_assign);
+  os2_libpath_refresh_value (v);
+  VSETATTR (v, att_special | att_nounset | att_exported);
+  INIT_DYNAMIC_VAR ("ENDLIBPATH", (char *)NULL, NULL, os2_libpath_assign);
+  os2_libpath_refresh_value (v);
+  VSETATTR (v, att_special | att_nounset | att_exported);
+  INIT_DYNAMIC_VAR ("LIBPATHSTRICT", (char *)NULL, NULL, os2_libpath_assign);
+  os2_libpath_refresh_value (v);
+  VSETATTR (v, att_special | att_nounset | att_exported);
+  INIT_DYNAMIC_VAR ("LIBPATH", (char *)NULL, NULL, (sh_var_assign_func_t *)NULL);
+  VSETATTR (v, att_special | att_nounset | att_exported | att_readonly | att_noassign);
+  os2_libpath_refresh_value (v);
+#endif 
 
   v = init_funcname_var ();
@@ -2779 +2880 @@
      SHELL_VAR *var;
 {
+#ifdef __OS2__
+  /* Keep the *LIBPATH* variables out of the exported environment variables. */
+  if (invisible_p (var) == 0 
+   && exported_p (var) 
+   && !function_p (var)
+   && specialvar_p (var) /* abusing this for speed */
+   && strstr(var->name, "LIBPATH"))
+    return 0;
+#endif 
   return (invisible_p (var) == 0 && exported_p (var));
 }