src/hg/lib/customPp.c 1.8

Index: src/hg/lib/customPp.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/lib/customPp.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -b -B -U 1000000 -r1.7 -r1.8
--- src/hg/lib/customPp.c	15 Nov 2006 19:25:33 -0000	1.7
+++ src/hg/lib/customPp.c	25 Sep 2009 00:20:20 -0000	1.8
@@ -1,129 +1,129 @@
 /* customPp - custom track preprocessor.  This handles the line-oriented
  * input/output for the custom track system.  The main services it provides
  * are taking care of references to URLs, which are treated as includes,
  * and moving lines that start with "browser" to a list.
  *
  * Also this allows unlimited "pushBack" of lines, which is handy, since
  * the system will analyse a number of lines of a track to see what format
  * it's in. */
 
 #include "common.h"
 #include "linefile.h"
 #include "net.h"
 #include "customPp.h"
 
 static char const rcsid[] = "$Id$";
 
 struct customPp *customDocPpNew(struct lineFile *lf)
 /* Return customPp that will ignore browser lines, for doc files */
 {
 struct customPp *cpp = customPpNew(lf);
 cpp->ignoreBrowserLines = TRUE;
 return cpp;
 }
 
 struct customPp *customPpNew(struct lineFile *lf)
 /* Return customPp on lineFile */
 {
 struct customPp *cpp;
 
 AllocVar(cpp);
 cpp->fileStack = lf;
 return cpp;
 }
 
 void customPpFree(struct customPp **pCpp)
 /* Close files and free up customPp. */
 {
 struct customPp *cpp = *pCpp;
 if (cpp)
     {
     lineFileCloseList(&cpp->fileStack);
     slFreeList(&cpp->browserLines);
     slFreeList(&cpp->reusedLines);
     freeMem(cpp->inReuse);
     }
 }
 
 char *customPpNext(struct customPp *cpp)
 /* Return next line. */
 {
 /* Check first for line to reuse. */
 struct slName *reused = cpp->reusedLines;
 if (reused)
     {
     /* We need to keep line actually reusing in memory until next
      * call to customPpNext, so we move it to inReuse rather than
      * immediately freeing it. */
     freeMem(cpp->inReuse);   
     cpp->reusedLines = reused->next;
     cpp->inReuse = reused;
     return reused->name;
     }
 
 /* Get next line from file on top of stack.  If at EOF
- * go to next file in stack.  If get a http:// or ftp:// line
+ * go to next file in stack.  If get a http:// or https:// or ftp:// line
  * open file this references and push it onto stack. Meanwhile
  * squirrel away 'browser' lines. */
 struct lineFile *lf;
 while ((lf = cpp->fileStack) != NULL)
     {
     char *line;
     if (lineFileNext(lf, &line, NULL))
         {
-	if (startsWith("http://", line) || startsWith("ftp://", line))
+	if (startsWith("http://", line) || startsWith("https://", line) || startsWith("ftp://", line))
 	    {
 	    lf = netLineFileOpen(line);
 	    slAddHead(&cpp->fileStack, lf);
 	    continue;
 	    }
 	else if (!cpp->ignoreBrowserLines && startsWith("browser", line))
 	    {
 	    char afterPattern = line[7];
 	    if (isspace(afterPattern) || afterPattern == 0)
 	        {
 		slNameAddTail(&cpp->browserLines, line);
 		continue;
 		}
 	    }
 	return line;
 	}
     else
         {
 	cpp->fileStack = lf->next;
 	lineFileClose(&lf);
 	}
     }
 return NULL;
 }
 
 char *customPpNextReal(struct customPp *cpp)
 /* Return next line that's nonempty and non-space. */
 {
 for (;;)
     {
     char *line = customPpNext(cpp);
     if (line == NULL)
         return line;
     char *s = skipLeadingSpaces(line);
     char c = *s;
     if (c != 0 && c != '#')
         return line;
     }
 }
 
 void customPpReuse(struct customPp *cpp, char *line)
 /* Reuse line.  May be called many times before next customPpNext/NextReal.
  * Should be called with last line to be reused first if called multiply. */
 {
 struct slName *s = slNameNew(line);
 slAddHead(&cpp->reusedLines, s);
 }
 
 struct slName *customPpTakeBrowserLines(struct customPp *cpp)
 /* Grab browser lines from cpp, which will no longer have them. */
 {
 struct slName *browserLines = cpp->browserLines;
 cpp->browserLines = NULL;
 return browserLines;
 }