iliaa           Fri Jan 10 19:20:50 2003 EDT

  Modified files:              
    /php4/sapi/cli      php_cli.c 
  Log:
  Fix the line numbering when the 1st line in the script is #!.
  
  
Index: php4/sapi/cli/php_cli.c
diff -u php4/sapi/cli/php_cli.c:1.61 php4/sapi/cli/php_cli.c:1.62
--- php4/sapi/cli/php_cli.c:1.61        Tue Jan  7 19:41:53 2003
+++ php4/sapi/cli/php_cli.c     Fri Jan 10 19:20:50 2003
@@ -414,6 +414,7 @@
        zend_llist global_vars;
        int interactive=0;
        int module_started = 0;
+       int lineno = 0;
        char *exec_direct=NULL;
        char *param_error=NULL;
 /* end of temporary locals */
@@ -702,7 +703,7 @@
                                                fseek(file_handle.handle.fp, pos - 1, 
SEEK_SET);
                                        }
                                }
-                               CG(start_lineno) = 2;
+                               lineno = 2;
                        } else {
                                rewind(file_handle.handle.fp);
                        }
@@ -733,6 +734,7 @@
                        PUTS("Could not startup.\n");
                        goto err;
                }
+               CG(start_lineno) = lineno;
                *arg_excp = arg_free; /* reconstuct argv */
                if (no_headers) {
                        SG(headers_sent) = 1;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to