Changeset 116023 in git

Timestamp:

Jan 8, 2014, 4:26:06 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

9a236dfb836ff04c250f1791ac6bfcf9c199c40a

Parents:

a821d149b494cb7005a11357ee001ae657e735ff

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-01-08 16:26:06+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-01-08 16:27:02+01:00

Message:

update iiLocateLib,iiInitSingularProcinfo

File:

• Singular/iplib.cc (modified) (3 diffs)

Singular/iplib.cc

@@ -797 +797 @@
 BOOLEAN iiLocateLib(const char* lib, char* where)
 {
-  idhdl hl;
-
-  char *p;
-
-  hl = IDROOT->get("LIB", 0);
-  if (hl == NULL || (p=strstr(IDSTRING(hl), lib)) == NULL) return FALSE;
-  if ((p!=IDSTRING(hl)) && (*(p-1)!=',')) return FALSE;
-
-  if (strstr(IDSTRING(hl), ",") == NULL)
-  {
-    strcpy(where, IDSTRING(hl));
+  char *plib = iiConvName(lib);
+  idhdl pl = basePack->idroot->get(plib,0);
+  if( (pl!=NULL) && (IDTYPr(pl)==PACKAGE_CMD) &&
+    (IDPACKAGE(pl)->language == LANG_SINGULAR))
+  {
+    strncpy(where,IDPACKAGE(pl)->libname,127);
+    return TRUE;
   }
   else
-  {
-    char* tmp = omStrDup(IDSTRING(hl));
-    char* tok = strtok(tmp, ",");
-    do
-    {
-      if (strstr(tok, lib) != NULL) break;
-      tok = strtok(NULL, ",");
-    }
-    while (tok != NULL);
-    assume(tok != NULL);
-    strcpy(where, tok);
-    omFree(tmp);
-  }
-  return TRUE;
+    return FALSE;;
 }
 
@@ -995 +978 @@
 {
   pi->libname = omStrDup(libname);
-
-  if( strcmp(procname,"_init")==0)
-  {
-    pi->procname = iiConvName(libname);
-  }
-  else
-    pi->procname = omStrDup(procname);
+  pi->procname = omStrDup(procname);
   pi->language = LANG_SINGULAR;
   pi->ref = 1;
@@ -1021 +998 @@
 }
 
-#if 0
-// TODO!?
-procinfo *iiInitSingularProcinfo(procinfo* pi, const char *libname,
-                                 const char *procname, int line, long pos,
-                                 BOOLEAN pstatic /*= FALSE*/)
-{
-  pi->libname = (char *)malloc(strlen(libname)+1);
-  memcpy(pi->libname, libname, strlen(libname));
-  *(pi->libname+strlen(libname)) = '\0';
-
-  pi->procname = (char *)malloc(strlen(procname)+1);
-  strcpy(pi->procname, procname/*, strlen(procname)*/);
-  pi->language = LANG_SINGULAR;
-  pi->ref = 1;
-  pi->is_static = pstatic;
-  pi->data.s.proc_start = pos;
-  pi->data.s.def_end    = 0L;
-  pi->data.s.help_start = 0L;
-  pi->data.s.body_start = 0L;
-  pi->data.s.body_end   = 0L;
-  pi->data.s.example_start = 0L;
-  pi->data.s.proc_lineno = line;
-  pi->data.s.body_lineno = 0;
-  pi->data.s.example_lineno = 0;
-  pi->data.s.body = NULL;
-  pi->data.s.help_chksum = 0;
-  return(pi);
-}
-#endif
-
 /*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/
 int iiAddCproc(const char *libname, const char *procname, BOOLEAN pstatic,