X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/35caf2388aecd13abc4fa67962c01186017af88d..a3724ed39:/uip/mhlogin.c?ds=sidebyside

diff --git a/uip/mhlogin.c b/uip/mhlogin.c
index d6dd0afd..1cc1c23c 100644
--- a/uip/mhlogin.c
+++ b/uip/mhlogin.c
@@ -1,5 +1,4 @@
-/*
- * mhlogin.c -- login to external (OAuth) services
+/* mhlogin.c -- login to external (OAuth) services
  *
  * This code is Copyright (c) 2014, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -13,6 +12,7 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <h/oauth.h>
+#include "../sbr/lock_file.h"
 
 #define MHLOGIN_SWITCHES \
     X("user username", 0, USERSW) \
@@ -36,13 +36,12 @@ DEFINE_SWITCH_ARRAY(MHLOGIN, switches);
 static char *
 geta (void)
 {
-    char *cp;
     static char line[BUFSIZ];
 
     if (fgets(line, sizeof(line), stdin) == NULL)
 	done (1);
-    if ((cp = strchr(line, '\n')))
-	*cp = 0;
+    trim_suffix_c(line, '\n');
+
     return line;
 }
 
@@ -110,7 +109,7 @@ do_login(const char *svc, const char *user, const char *browser, int snoop)
       code = geta();
     }
     if (cred == NULL) {
-      advise(NULL, "error exchanging code for OAuth2 token");
+      inform("error exchanging code for OAuth2 token");
       adios(NULL, mh_oauth_get_err_string(ctx));
     }