CRLF -> LF

diff --git a/parsers.c b/parsers.c
index 7c12bea..fc43e01 100644 (file)
--- a/parsers.c
+++ b/parsers.c
@@ -1,4 +1,4 @@
-const char parsers_rcs[] = "$Id: parsers.c,v 1.10 2001/05/29 09:50:24 jongfoster Exp $";
+const char parsers_rcs[] = "$Id: parsers.c,v 1.11 2001/05/29 20:11:19 joergs Exp $";

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/parsers.c,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/parsers.c,v $


@@ -41,6 +41,9 @@ const char parsers_rcs[] = "$Id: parsers.c,v 1.10 2001/05/29 09:50:24 jongfoster
  *
  * Revisions   :
  *    $Log: parsers.c,v $
  *
  * Revisions   :
  *    $Log: parsers.c,v $

+ *    Revision 1.11  2001/05/29 20:11:19  joergs
+ *    '/* inside comment' warning removed.
+ *

  *    Revision 1.10  2001/05/29 09:50:24  jongfoster
  *    Unified blocklist/imagelist/permissionslist.
  *    File format is still under discussion, but the internal changes
  *    Revision 1.10  2001/05/29 09:50:24  jongfoster
  *    Unified blocklist/imagelist/permissionslist.
  *    File format is still under discussion, but the internal changes


@@ -888,9 +891,9 @@ char *client_referrer(const struct parsers *v, char *s, struct client_state *csp
    strclean(s, FORCE_PREFIX);
 #endif /* def FORCE_LOAD */
 
    strclean(s, FORCE_PREFIX);
 #endif /* def FORCE_LOAD */
 

-#ifdef TRUST_FILES\r
+#ifdef TRUST_FILES

    csp->referrer = strdup(s);
    csp->referrer = strdup(s);

-#endif /* def TRUST_FILES */\r
+#endif /* def TRUST_FILES */

 
    /*
     * Check permissionsfile.  If we have allowed this site to get the
 
    /*
     * Check permissionsfile.  If we have allowed this site to get the

diff --git a/w32log.c b/w32log.c
index 90a3bd7..37614df 100644 (file)
--- a/w32log.c
+++ b/w32log.c
@@ -1,4 +1,4 @@
-const char w32log_rcs[] = "$Id: w32log.c,v 1.7 2001/05/26 01:26:34 jongfoster Exp $";
+const char w32log_rcs[] = "$Id: w32log.c,v 1.8 2001/05/29 09:50:24 jongfoster Exp $";

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/w32log.c,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/w32log.c,v $


@@ -32,6 +32,29 @@ const char w32log_rcs[] = "$Id: w32log.c,v 1.7 2001/05/26 01:26:34 jongfoster Ex
  *
  * Revisions   :
  *    $Log: w32log.c,v $
  *
  * Revisions   :
  *    $Log: w32log.c,v $

+ *    Revision 1.8  2001/05/29 09:50:24  jongfoster
+ *    Unified blocklist/imagelist/permissionslist.
+ *    File format is still under discussion, but the internal changes
+ *    are (mostly) done.
+ *
+ *    Also modified interceptor behaviour:
+ *    - We now intercept all URLs beginning with one of the following
+ *      prefixes (and *only* these prefixes):
+ *        * http://i.j.b/
+ *        * http://ijbswa.sf.net/config/
+ *        * http://ijbswa.sourceforge.net/config/
+ *    - New interceptors "home page" - go to http://i.j.b/ to see it.
+ *    - Internal changes so that intercepted and fast redirect pages
+ *      are not replaced with an image.
+ *    - Interceptors now have the option to send a binary page direct
+ *      to the client. (i.e. ijb-send-banner uses this)
+ *    - Implemented show-url-info interceptor.  (Which is why I needed
+ *      the above interceptors changes - a typical URL is
+ *      "http://i.j.b/show-url-info?url=www.somesite.com/banner.gif".
+ *      The previous mechanism would not have intercepted that, and
+ *      if it had been intercepted then it then it would have replaced
+ *      it with an image.)
+ *

  *    Revision 1.7  2001/05/26 01:26:34  jongfoster
  *    New #define, WIN_GUI_EDIT, enables the (embryonic) Win32 GUI editor.
  *    This #define cannot be set from ./configure - there's no point, it
  *    Revision 1.7  2001/05/26 01:26:34  jongfoster
  *    New #define, WIN_GUI_EDIT, enables the (embryonic) Win32 GUI editor.
  *    This #define cannot be set from ./configure - there's no point, it


@@ -955,9 +978,9 @@ void OnLogRButtonUp(int nModifier, int x, int y)
    if (hMenu != NULL)
    {
       HMENU hMenuPopup = GetSubMenu(hMenu, 0);
    if (hMenu != NULL)
    {
       HMENU hMenuPopup = GetSubMenu(hMenu, 0);

-#ifdef WIN_GUI_EDIT\r
+#ifdef WIN_GUI_EDIT

       char *szURL;
       char *szURL;

-#endif /* def WIN_GUI_EDIT */\r
+#endif /* def WIN_GUI_EDIT */

 
       /* Check if there is a selection */
       CHARRANGE range;
 
       /* Check if there is a selection */
       CHARRANGE range;


@@ -970,8 +993,8 @@ void OnLogRButtonUp(int nModifier, int x, int y)
       {
          EnableMenuItem(hMenuPopup, ID_EDIT_COPY, MF_BYCOMMAND | MF_ENABLED);
       }
       {
          EnableMenuItem(hMenuPopup, ID_EDIT_COPY, MF_BYCOMMAND | MF_ENABLED);
       }

-\r
-#ifdef WIN_GUI_EDIT\r
+
+#ifdef WIN_GUI_EDIT

       /* Check if cursor is over a link */
       szURL = LogGetURLUnderCursor();
       if (szURL)
       /* Check if cursor is over a link */
       szURL = LogGetURLUnderCursor();
       if (szURL)


@@ -1003,7 +1026,7 @@ void OnLogRButtonUp(int nModifier, int x, int y)
 
          free(szURL);
       }
 
          free(szURL);
       }

-#endif /* def WIN_GUI_EDIT */\r
+#endif /* def WIN_GUI_EDIT */

 
       /* Display the popup */
       TrackPopupMenu(hMenuPopup, TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RIGHTBUTTON, x, y, 0, g_hwndLogFrame, NULL);
 
       /* Display the popup */
       TrackPopupMenu(hMenuPopup, TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RIGHTBUTTON, x, y, 0, g_hwndLogFrame, NULL);


@@ -1110,11 +1133,11 @@ void OnLogCommand(int nCommand)
          break;
 #endif /* def TRUST_FILES */
 
          break;
 #endif /* def TRUST_FILES */
 

-#ifdef WIN_GUI_EDIT\r
+#ifdef WIN_GUI_EDIT

       case ID_NEW_BLOCKER:
          ShowRulesDialog(g_hwndLogFrame);
          break;
       case ID_NEW_BLOCKER:
          ShowRulesDialog(g_hwndLogFrame);
          break;

-#endif /* def WIN_GUI_EDIT */\r
+#endif /* def WIN_GUI_EDIT */

 
       case ID_HELP_GPL:
          ShellExecute(g_hwndLogFrame, "open", "gpl.html", NULL, NULL, SW_SHOWNORMAL);
 
       case ID_HELP_GPL:
          ShellExecute(g_hwndLogFrame, "open", "gpl.html", NULL, NULL, SW_SHOWNORMAL);