almost entirely get rid of the culture of ".h files that include .h files"

ok djm, sort of ok stevesk
makes the pain stop in one easy step

1 files changed, 6 insertions, 6 deletions

diff --git a/usr.bin/ssh/sftp-server.c b/usr.bin/ssh/sftp-server.c
index 5919f24875d..571d387d0e9 100644
--- a/usr.bin/ssh/sftp-server.c
+++ b/usr.bin/ssh/sftp-server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-server.c,v 1.69 2006/08/01 23:22:47 stevesk Exp $ */
+/* $OpenBSD: sftp-server.c,v 1.70 2006/08/03 03:34:42 deraadt Exp $ */
 /*
  * Copyright (c) 2000-2004 Markus Friedl.  All rights reserved.
  *
@@ -14,7 +14,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#include "includes.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -27,13 +26,14 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <pwd.h>
 #include <time.h>
 #include <unistd.h>
+#include <stdarg.h>
 
+#include "xmalloc.h"
 #include "buffer.h"
-#include "bufaux.h"
 #include "log.h"
-#include "xmalloc.h"
 #include "misc.h"
 #include "uidswap.h"
 
@@ -132,7 +132,7 @@ string_from_portable(int pflags)
 #define PAPPEND(str)	{				\
 		if (*ret != '\0')			\
 			strlcat(ret, ",", sizeof(ret));	\
-		strlcat(ret, str, sizeof(ret)); 	\
+		strlcat(ret, str, sizeof(ret));		\
 	}
 
 	if (pflags & SSH2_FXF_READ)
@@ -1205,7 +1205,7 @@ main(int argc, char **argv)
 		case 'c':
 			/*
 			 * Ignore all arguments if we are invoked as a
-			 * shell using "sftp-server -c command" 
+			 * shell using "sftp-server -c command"
 			 */
 			skipargs = 1;
 			break;