In the text client, changed some misleading error messages

[citadel.git] / textclient / client_passwords.c

diff --git a/textclient/client_passwords.c b/textclient/client_passwords.c
index 6187a7cd3c4ddd3ef3aa5bf6ae75610d24bff1ac..59c9c04238912703a7863d0f6b30265666b7a558 100644 (file)
--- a/textclient/client_passwords.c
+++ b/textclient/client_passwords.c
@@ -15,8 +15,7 @@
 
 #define PWFILENAME "%s/.citadel.passwords"
 
-void determine_pwfilename(char *pwfile, size_t n)
-{
+void determine_pwfilename(char *pwfile, size_t n) {
        struct passwd *p;
 
        p = getpwuid(getuid());
@@ -30,8 +29,7 @@ void determine_pwfilename(char *pwfile, size_t n)
  * Check the password file for a host/port match; if found, stuff the user
  * name and password into the user/pass buffers
  */
-void get_stored_password(char *host, char *port, char *username, char *password)
-{
+void get_stored_password(char *host, char *port, char *username, char *password) {
 
        char pwfile[PATH_MAX];
        FILE *fp;
@@ -70,8 +68,7 @@ void get_stored_password(char *host, char *port, char *username, char *password)
 /*
  * Set (or clear) stored passwords.
  */
-void set_stored_password(char *host, char *port, char *username, char *password)
-{
+void set_stored_password(char *host, char *port, char *username, char *password) {
 
        char pwfile[PATH_MAX];
        FILE *fp, *oldfp;
@@ -100,13 +97,13 @@ void set_stored_password(char *host, char *port, char *username, char *password)
                if ((strcasecmp(hostbuf, host))
                    || (strcasecmp(portbuf, port))) {
                        snprintf(buf, sizeof buf, "%s|%s|%s|%s|", hostbuf, portbuf, ubuf, pbuf);
-                       CtdlEncodeBase64(buf64, buf, strlen(buf), 0);
+                       CtdlEncodeBase64(buf64, buf, strlen(buf), BASE64_NO_LINEBREAKS);
                        fprintf(fp, "%s\n", buf64);
                }
        }
        if (!IsEmptyStr(username)) {
                snprintf(buf, sizeof buf, "%s|%s|%s|%s|", host, port, username, password);
-               CtdlEncodeBase64(buf64, buf, strlen(buf), 0);
+               CtdlEncodeBase64(buf64, buf, strlen(buf), BASE64_NO_LINEBREAKS);
                fprintf(fp, "%s\n", buf64);
        }
        fclose(oldfp);
@@ -118,13 +115,13 @@ void set_stored_password(char *host, char *port, char *username, char *password)
 /*
  * Set the password if the user wants to, clear it otherwise 
  */
-void offer_to_remember_password(CtdlIPC * ipc, char *host, char *port, char *username, char *password)
-{
+void offer_to_remember_password(CtdlIPC * ipc, char *host, char *port, char *username, char *password) {
 
        if (rc_remember_passwords) {
                if (boolprompt("Remember username/password for this site", 0)) {
                        set_stored_password(host, port, username, password);
-               } else {
+               }
+               else {
                        set_stored_password(host, port, "", "");
                }
        }