Skip to content

Commit 5ae4245

Browse files
committed
Fix multiline C comments in psql.
1 parent e5f5e73 commit 5ae4245

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

src/bin/psql/mainloop.c

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.53 2003/03/20 06:43:35 momjian Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.54 2003/03/20 22:08:50 momjian Exp $
77
*/
88
#include "postgres_fe.h"
99
#include "mainloop.h"
@@ -272,21 +272,24 @@ MainLoop(FILE *source)
272272

273273
/* start of extended comment? */
274274
else if (line[i] == '/' && line[i + thislen] == '*')
275-
{
275+
{
276276
in_xcomment++;
277277
if (in_xcomment == 1)
278-
ADVANCE_1;
279-
}
278+
ADVANCE_1;
279+
}
280280

281-
/* end of extended comment? */
282-
else if (line[i] == '*' && line[i + thislen] == '/')
281+
/* in or end of extended comment? */
282+
else if (in_xcomment)
283283
{
284-
in_xcomment--;
285-
if (in_xcomment <= 0)
284+
if (line[i] == '*' && line[i + thislen] == '/')
286285
{
287-
in_xcomment = 0;
288-
ADVANCE_1;
289-
}
286+
in_xcomment--;
287+
if (in_xcomment <= 0)
288+
{
289+
in_xcomment = 0;
290+
ADVANCE_1;
291+
}
292+
}
290293
}
291294

292295
/* start of quote? */

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy