Make the psql line counter 64-bit so it can handle files > 4gig lines.

David Fetter

diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index b7755aa374e0cdfcbfe4324b1afb32460e6a7b9e..ca77b81808fec65e267b577682a069255e463a02 100644 (file)
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2006, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.122 2006/07/14 14:52:26 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.123 2006/08/11 19:20:59 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "common.h"
@@ -188,7 +188,7 @@ psql_error(const char *fmt,...)
        fflush(pset.queryFout);
 
    if (pset.inputfile)
-       fprintf(stderr, "%s:%s:%u: ", pset.progname, pset.inputfile, pset.lineno);
+       fprintf(stderr, "%s:%s:" UINT64_FORMAT ": ", pset.progname, pset.inputfile, pset.lineno);
    va_start(ap, fmt);
    vfprintf(stderr, _(fmt), ap);
    va_end(ap);

diff --git a/src/bin/psql/mainloop.c b/src/bin/psql/mainloop.c
index fdbf29d8e3097348b0c1ec77b855228b90312cdf..730210b20c9e13c0950ac3a9b0dbe0f5a3f89f1f 100644 (file)
--- a/src/bin/psql/mainloop.c
+++ b/src/bin/psql/mainloop.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2006, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/mainloop.c,v 1.81 2006/07/14 14:52:26 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/mainloop.c,v 1.82 2006/08/11 19:20:59 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "mainloop.h"
@@ -44,7 +44,7 @@ MainLoop(FILE *source)
    /* Save the prior command source */
    FILE       *prev_cmd_source;
    bool        prev_cmd_interactive;
-   unsigned int prev_lineno;
+   uint64      prev_lineno;
 
    /* Save old settings */
    prev_cmd_source = pset.cur_cmd_source;

diff --git a/src/bin/psql/settings.h b/src/bin/psql/settings.h
index 2509593bbbee16f9f0148c0c56b61340aee4c746..a5c4a02be9e21984e85bcb1b2e64d06d00fa5ff7 100644 (file)
--- a/src/bin/psql/settings.h
+++ b/src/bin/psql/settings.h
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2006, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/settings.h,v 1.27 2006/03/05 15:58:52 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/settings.h,v 1.28 2006/08/11 19:20:59 momjian Exp $
  */
 #ifndef SETTINGS_H
 #define SETTINGS_H
@@ -50,7 +50,7 @@ typedef struct _psqlSettings
    char       *inputfile;      /* for error reporting */
    char       *dirname;        /* current directory for \s display */
 
-   unsigned    lineno;         /* also for error reporting */
+   uint64      lineno;         /* also for error reporting */
 
    bool        timing;         /* enable timing of all queries */