pgindent copy.c. Patch wasn't in proper format.

bmomjian · bmomjian · commit 87675fab6f23 · 2002-02-24T02:33:33.000Z
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.147 2002/02/24 02:32:26 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.148 2002/02/24 02:33:33 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -326,20 +326,22 @@ DoCopy(char *relname, bool binary, bool oids, bool from, bool pipe,
 		}
 		else
 		{
-      struct stat st;
+			struct stat st;
+
 			fp = AllocateFile(filename, PG_BINARY_R);
-			
-      if (fp == NULL)
+
+			if (fp == NULL)
 				elog(ERROR, "COPY command, running in backend with "
 					 "effective uid %d, could not open file '%s' for "
 					 "reading.  Errno = %s (%d).",
 					 (int) geteuid(), filename, strerror(errno), errno);
-      
-      fstat(fileno(fp),&st);
-      if( S_ISDIR(st.st_mode) ){
-		FreeFile(fp);
-        elog(ERROR,"COPY: %s is a directory.",filename);
-      }
+
+			fstat(fileno(fp), &st);
+			if (S_ISDIR(st.st_mode))
+			{
+				FreeFile(fp);
+				elog(ERROR, "COPY: %s is a directory.", filename);
+			}
 		}
 		CopyFrom(rel, binary, oids, fp, delim, null_print);
 	}
@@ -368,7 +370,7 @@ DoCopy(char *relname, bool binary, bool oids, bool from, bool pipe,
 		else
 		{
 			mode_t		oumask; /* Pre-existing umask value */
-      struct stat st;
+			struct stat st;
 
 			/*
 			 * Prevent write to relative path ... too easy to shoot
@@ -387,11 +389,12 @@ DoCopy(char *relname, bool binary, bool oids, bool from, bool pipe,
 					 "effective uid %d, could not open file '%s' for "
 					 "writing.  Errno = %s (%d).",
 					 (int) geteuid(), filename, strerror(errno), errno);
-      fstat(fileno(fp),&st);
-      if( S_ISDIR(st.st_mode) ){
-		FreeFile(fp);
-        elog(ERROR,"COPY: %s is a directory.",filename);
-      }
+			fstat(fileno(fp), &st);
+			if (S_ISDIR(st.st_mode))
+			{
+				FreeFile(fp);
+				elog(ERROR, "COPY: %s is a directory.", filename);
+			}
 		}
 		CopyTo(rel, binary, oids, fp, delim, null_print);
 	}
@@ -1097,25 +1100,25 @@ CopyReadAttribute(FILE *fp, bool *isnull, char *delim, int *newline, char *null_
 						if (ISOCTAL(c))
 						{
 							val = (val << 3) + OCTVALUE(c);
-							CopyDonePeek(fp, c, true /*pick up*/);
+							CopyDonePeek(fp, c, true /* pick up */ );
 							c = CopyPeekChar(fp);
 							if (ISOCTAL(c))
 							{
 								val = (val << 3) + OCTVALUE(c);
-								CopyDonePeek(fp, c, true /*pick up*/);
+								CopyDonePeek(fp, c, true /* pick up */ );
 							}
 							else
 							{
 								if (c == EOF)
 									goto endOfFile;
-								CopyDonePeek(fp, c, false /*put back*/);
+								CopyDonePeek(fp, c, false /* put back */ );
 							}
 						}
 						else
 						{
 							if (c == EOF)
 								goto endOfFile;
-							CopyDonePeek(fp, c, false /*put back*/);
+							CopyDonePeek(fp, c, false /* put back */ );
 						}
 						c = val & 0377;
 					}

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.147 2002/02/24 02:32:26 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.148 2002/02/24 02:33:33 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -326,20 +326,22 @@ DoCopy(char *relname, bool binary, bool oids, bool from, bool pipe,`
`326`	`326`	`}`
`327`	`327`	`else`
`328`	`328`	`{`
`329`		`- struct stat st;`
	`329`	`+ struct stat st;`
	`330`	`+`
`330`	`331`	`fp = AllocateFile(filename, PG_BINARY_R);`
`331`		`-`
`332`		`- if (fp == NULL)`
	`332`	`+`
	`333`	`+ if (fp == NULL)`
`333`	`334`	`elog(ERROR, "COPY command, running in backend with "`
`334`	`335`	`"effective uid %d, could not open file '%s' for "`
`335`	`336`	`"reading. Errno = %s (%d).",`
`336`	`337`	`(int) geteuid(), filename, strerror(errno), errno);`
`337`		`-`
`338`		`- fstat(fileno(fp),&st);`
`339`		`- if( S_ISDIR(st.st_mode) ){`
`340`		`- FreeFile(fp);`
`341`		`- elog(ERROR,"COPY: %s is a directory.",filename);`
`342`		`- }`
	`338`	`+`
	`339`	`+ fstat(fileno(fp), &st);`
	`340`	`+ if (S_ISDIR(st.st_mode))`
	`341`	`+ {`
	`342`	`+ FreeFile(fp);`
	`343`	`+ elog(ERROR, "COPY: %s is a directory.", filename);`
	`344`	`+ }`
`343`	`345`	`}`
`344`	`346`	`CopyFrom(rel, binary, oids, fp, delim, null_print);`
`345`	`347`	`}`
`@@ -368,7 +370,7 @@ DoCopy(char *relname, bool binary, bool oids, bool from, bool pipe,`
`368`	`370`	`else`
`369`	`371`	`{`
`370`	`372`	`mode_t oumask; /* Pre-existing umask value */`
`371`		`- struct stat st;`
	`373`	`+ struct stat st;`
`372`	`374`
`373`	`375`	`/*`
`374`	`376`	`* Prevent write to relative path ... too easy to shoot`
`@@ -387,11 +389,12 @@ DoCopy(char *relname, bool binary, bool oids, bool from, bool pipe,`
`387`	`389`	`"effective uid %d, could not open file '%s' for "`
`388`	`390`	`"writing. Errno = %s (%d).",`
`389`	`391`	`(int) geteuid(), filename, strerror(errno), errno);`
`390`		`- fstat(fileno(fp),&st);`
`391`		`- if( S_ISDIR(st.st_mode) ){`
`392`		`- FreeFile(fp);`
`393`		`- elog(ERROR,"COPY: %s is a directory.",filename);`
`394`		`- }`
	`392`	`+ fstat(fileno(fp), &st);`
	`393`	`+ if (S_ISDIR(st.st_mode))`
	`394`	`+ {`
	`395`	`+ FreeFile(fp);`
	`396`	`+ elog(ERROR, "COPY: %s is a directory.", filename);`
	`397`	`+ }`
`395`	`398`	`}`
`396`	`399`	`CopyTo(rel, binary, oids, fp, delim, null_print);`
`397`	`400`	`}`
`@@ -1097,25 +1100,25 @@ CopyReadAttribute(FILE fp, bool isnull, char delim, int newline, char *null_`
`1097`	`1100`	`if (ISOCTAL(c))`
`1098`	`1101`	`{`
`1099`	`1102`	`val = (val << 3) + OCTVALUE(c);`
`1100`		`- CopyDonePeek(fp, c, true /pick up/);`
	`1103`	`+ CopyDonePeek(fp, c, true /* pick up */ );`
`1101`	`1104`	`c = CopyPeekChar(fp);`
`1102`	`1105`	`if (ISOCTAL(c))`
`1103`	`1106`	`{`
`1104`	`1107`	`val = (val << 3) + OCTVALUE(c);`
`1105`		`- CopyDonePeek(fp, c, true /pick up/);`
	`1108`	`+ CopyDonePeek(fp, c, true /* pick up */ );`
`1106`	`1109`	`}`
`1107`	`1110`	`else`
`1108`	`1111`	`{`
`1109`	`1112`	`if (c == EOF)`
`1110`	`1113`	`goto endOfFile;`
`1111`		`- CopyDonePeek(fp, c, false /put back/);`
	`1114`	`+ CopyDonePeek(fp, c, false /* put back */ );`
`1112`	`1115`	`}`
`1113`	`1116`	`}`
`1114`	`1117`	`else`
`1115`	`1118`	`{`
`1116`	`1119`	`if (c == EOF)`
`1117`	`1120`	`goto endOfFile;`
`1118`		`- CopyDonePeek(fp, c, false /put back/);`
	`1121`	`+ CopyDonePeek(fp, c, false /* put back */ );`
`1119`	`1122`	`}`
`1120`	`1123`	`c = val & 0377;`
`1121`	`1124`	`}`