Changeset 423f4e in git

Timestamp:

Jun 30, 2022, 4:42:35 PM (23 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd08f5f0bb3329b8ca19f23b74cb1473686415c3a')

Children:

cd85559781a82f98cee87f0b7349312ac19f2720

Parents:

3ec443ec8a8353d01c006883f4c1f12b732a816d

Message:

allow (some)help in restricted mode

File:

• Singular/fehelp.cc (modified) (4 diffs)

Singular/fehelp.cc

@@ -812 +812 @@
 static BOOLEAN heGenInit(int warn, int br)
 {
-  if (FE_OPT_NO_SHELL_FLAG)
-  {
-    if (warn) WarnS("restricted mod: generic help not available");
-    return FALSE;
-  }
   if (heHelpBrowsers[br].required==NULL) return TRUE;
   const char *p=heHelpBrowsers[br].required;
@@ -859 +854 @@
                  if ((op=='O') && (strcmp(name,S_UNAME)!=0))
                    return FALSE;
-                 if ((op=='E') && (omFindExec(name,exec)==NULL))
+                 if ((op=='E') && ((omFindExec(name,exec)==NULL) || FE_OPT_NO_SHELL_FLAG))
                  {
                    if (warn) Warn("executable `%s` not found",name);
@@ -876 +871 @@
 static void heGenHelp(heEntry hentry, int br)
 {
-  if (FE_OPT_NO_SHELL_FLAG) return;
   char sys[MAX_SYSCMD_LEN];
   const char *p=heHelpBrowsers[br].action;
@@ -1011 +1005 @@
   }
   Print("running `%s`\n",sys);
-  (void) system(sys);
+  if (!FE_OPT_NO_SHELL_FLAG) (void) system(sys);
 }