Oops.. =) mispelt NGROUPS_MAX.

[openssh.git] / scp.c

diff --git a/scp.c b/scp.c
index 1fb87f42b3db320914c06e90874b1eac908a86dc..f8f123af4f8b24fc1a65b04aa501c3b1ad432aa8 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -75,14 +75,12 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: scp.c,v 1.47 2000/12/19 23:17:57 markus Exp $");
+RCSID("$OpenBSD: scp.c,v 1.51 2001/01/21 19:05:55 markus Exp $");
 
-#include "ssh.h"
 #include "xmalloc.h"
-
-#ifndef _PATH_CP
-#define _PATH_CP "cp"
-#endif
+#include "atomicio.h"
+#include "pathnames.h"
+#include "log.h"
 
 #ifdef HAVE___PROGNAME
 extern char *__progname;
@@ -130,7 +128,7 @@ int verbose_mode = 0;
 int showprogress = 1;
 
 /* This is the program to execute for the secured connection. ("ssh" or -S) */
-char *ssh_program = SSH_PROGRAM;
+char *ssh_program = _PATH_SSH_PROGRAM;
 
 /* This is the list of arguments that scp passes to ssh */
 struct {
@@ -198,19 +196,6 @@ do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout, int argc)
        return 0;
 }
 
-void
-fatal(const char *fmt,...)
-{
-       va_list ap;
-       char buf[1024];
-
-       va_start(ap, fmt);
-       vsnprintf(buf, sizeof(buf), fmt, ap);
-       va_end(ap);
-       fprintf(stderr, "%s\n", buf);
-       exit(255);
-}
-
 typedef struct {
        int cnt;
        char *buf;
@@ -260,7 +245,7 @@ main(argc, argv)
        addargs("-oFallBackToRsh no");
 
        fflag = tflag = 0;
-       while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q46S:o:")) != EOF)
+       while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q46S:o:")) != -1)
                switch (ch) {
                /* User-visible flags. */
                case '4':
@@ -1126,11 +1111,7 @@ foregroundproc()
        if (pgrp == -1)
                pgrp = getpgrp();
 
-#ifdef HAVE_CYGWIN
-       /*
-        * Cygwin only supports tcgetpgrp() for getting the controlling tty
-         * currently.
-        */
+#ifdef HAVE_TCGETPGRP
        return ((ctty_pgrp = tcgetpgrp(STDOUT_FILENO)) != -1 &&
                ctty_pgrp == pgrp);
 #else