upstream: When system calls indicate an error they return -1, not

some arbitrary value < 0.  errno is only updated in this case.  Change all
(most?) callers of syscalls to follow this better, and let's see if this
strictness helps us in the future.

OpenBSD-Commit-ID: 48081f00db7518e3b712a49dca06efc2a5428075

1 files changed, 12 insertions, 12 deletions

diff --git a/ssh-keygen.c b/ssh-keygen.c
index c95bc15cf..3aa4f5125 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.332 2019/06/21 04:21:04 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.333 2019/06/28 13:35:04 deraadt Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -370,7 +370,7 @@ do_convert_to(struct passwd *pw)
 
         if (!have_identity)
                 ask_filename(pw, "Enter file in which the key is");
-        if (stat(identity_file, &st) < 0)
+        if (stat(identity_file, &st) == -1)
                 fatal("%s: %s: %s", __progname, identity_file, strerror(errno));
         if ((r = sshkey_load_public(identity_file, &k, NULL)) != 0)
                 k = load_identity(identity_file);
@@ -696,7 +696,7 @@ do_convert_from(struct passwd *pw)
 
         if (!have_identity)
                 ask_filename(pw, "Enter file in which the key is");
-        if (stat(identity_file, &st) < 0)
+        if (stat(identity_file, &st) == -1)
                 fatal("%s: %s: %s", __progname, identity_file, strerror(errno));
 
         switch (convert_format) {
@@ -756,7 +756,7 @@ do_print_public(struct passwd *pw)
 
         if (!have_identity)
                 ask_filename(pw, "Enter file in which the key is");
-        if (stat(identity_file, &st) < 0)
+        if (stat(identity_file, &st) == -1)
                 fatal("%s: %s", identity_file, strerror(errno));
         prv = load_identity(identity_file);
         if ((r = sshkey_write(prv, stdout)) != 0)
@@ -854,7 +854,7 @@ fingerprint_private(const char *path)
         struct sshkey *public = NULL;
         int r;
 
-        if (stat(identity_file, &st) < 0)
+        if (stat(identity_file, &st) == -1)
                 fatal("%s: %s", path, strerror(errno));
         if ((r = sshkey_load_public(path, &public, &comment)) != 0) {
                 debug("load public \"%s\": %s", path, ssh_err(r));
@@ -1340,7 +1340,7 @@ do_change_passphrase(struct passwd *pw)
 
         if (!have_identity)
                 ask_filename(pw, "Enter file in which the key is");
-        if (stat(identity_file, &st) < 0)
+        if (stat(identity_file, &st) == -1)
                 fatal("%s: %s", identity_file, strerror(errno));
         /* Try to load the file with empty passphrase. */
         r = sshkey_load_private(identity_file, "", &private, &comment);
@@ -1424,7 +1424,7 @@ do_print_resource_record(struct passwd *pw, char *fname, char *hname,
 
         if (fname == NULL)
                 fatal("%s: no filename", __func__);
-        if (stat(fname, &st) < 0) {
+        if (stat(fname, &st) == -1) {
                 if (errno == ENOENT)
                         return 0;
                 fatal("%s: %s", fname, strerror(errno));
@@ -1453,7 +1453,7 @@ do_change_comment(struct passwd *pw, const char *identity_comment)
 
         if (!have_identity)
                 ask_filename(pw, "Enter file in which the key is");
-        if (stat(identity_file, &st) < 0)
+        if (stat(identity_file, &st) == -1)
                 fatal("%s: %s", identity_file, strerror(errno));
         if ((r = sshkey_load_private(identity_file, "",
             &private, &comment)) == 0)
@@ -2045,7 +2045,7 @@ do_show_cert(struct passwd *pw)
 
         if (!have_identity)
                 ask_filename(pw, "Enter file in which the key is");
-        if (strcmp(identity_file, "-") != 0 && stat(identity_file, &st) < 0)
+        if (strcmp(identity_file, "-") != 0 && stat(identity_file, &st) == -1)
                 fatal("%s: %s: %s", __progname, identity_file, strerror(errno));
 
         path = identity_file;
@@ -2472,7 +2472,7 @@ main(int argc, char **argv)
         pw = getpwuid(getuid());
         if (!pw)
                 fatal("No user exists for uid %lu", (u_long)getuid());
-        if (gethostname(hostname, sizeof(hostname)) < 0)
+        if (gethostname(hostname, sizeof(hostname)) == -1)
                 fatal("gethostname: %s", strerror(errno));
 
         /* Remaining characters: Ydw */
@@ -2852,11 +2852,11 @@ main(int argc, char **argv)
         snprintf(dotsshdir, sizeof dotsshdir, "%s/%s",
             pw->pw_dir, _PATH_SSH_USER_DIR);
         if (strstr(identity_file, dotsshdir) != NULL) {
-                if (stat(dotsshdir, &st) < 0) {
+                if (stat(dotsshdir, &st) == -1) {
                         if (errno != ENOENT) {
                                 error("Could not stat %s: %s", dotsshdir,
                                     strerror(errno));
-                        } else if (mkdir(dotsshdir, 0700) < 0) {
+                        } else if (mkdir(dotsshdir, 0700) == -1) {
                                 error("Could not create directory '%s': %s",
                                     dotsshdir, strerror(errno));
                         } else if (!quiet)