+++ /dev/null
---- a/ssmtp.c
-+++ b/ssmtp.c
-@@ -55,21 +55,21 @@ bool_t use_oldauth = False; /* use old
-
- #define ARPADATE_LENGTH 32 /* Current date in RFC format */
- char arpadate[ARPADATE_LENGTH];
--char *auth_user = (char)NULL;
--char *auth_pass = (char)NULL;
--char *auth_method = (char)NULL; /* Mechanism for SMTP authentication */
--char *mail_domain = (char)NULL;
--char *from = (char)NULL; /* Use this as the From: address */
-+char *auth_user = NULL;
-+char *auth_pass = NULL;
-+char *auth_method = NULL; /* Mechanism for SMTP authentication */
-+char *mail_domain = NULL;
-+char *from = NULL; /* Use this as the From: address */
- char *hostname;
- char *mailhost = "mailhub";
--char *minus_f = (char)NULL;
--char *minus_F = (char)NULL;
-+char *minus_f = NULL;
-+char *minus_F = NULL;
- char *gecos;
--char *prog = (char)NULL;
-+char *prog = NULL;
- char *root = NULL;
- char *tls_cert = "/etc/ssl/certs/ssmtp.pem"; /* Default Certificate */
--char *uad = (char)NULL;
--char *config_file = (char)NULL; /* alternate configuration file */
-+char *uad = NULL;
-+char *config_file = NULL; /* alternate configuration file */
-
- headers_t headers, *ht;
-
-@@ -261,7 +261,7 @@ char *strip_post_ws(char *str)
-
- p = (str + strlen(str));
- while(isspace(*--p)) {
-- *p = (char)NULL;
-+ *p = '\0';
- }
-
- return(p);
-@@ -279,7 +279,7 @@ char *addr_parse(char *str)
- #endif
-
- /* Simple case with email address enclosed in <> */
-- if((p = strdup(str)) == (char *)NULL) {
-+ if((p = strdup(str)) == NULL) {
- die("addr_parse(): strdup()");
- }
-
-@@ -287,7 +287,7 @@ char *addr_parse(char *str)
- q++;
-
- if((p = strchr(q, '>'))) {
-- *p = (char)NULL;
-+ *p = '\0';
- }
-
- #if 0
-@@ -310,7 +310,7 @@ char *addr_parse(char *str)
- q = strip_post_ws(p);
- if(*q == ')') {
- while((*--q != '('));
-- *q = (char)NULL;
-+ *q = '\0';
- }
- (void)strip_post_ws(p);
-
-@@ -349,7 +349,6 @@ standardise() -- Trim off '\n's and doub
- */
- bool_t standardise(char *str, bool_t *linestart)
- {
-- size_t sl;
- char *p;
- bool_t leadingdot = False;
-
-@@ -363,7 +362,7 @@ bool_t standardise(char *str, bool_t *li
- *linestart = False;
-
- if((p = strchr(str, '\n'))) {
-- *p = (char)NULL;
-+ *p = '\0';
- *linestart = True;
- }
- return(leadingdot);
-@@ -384,7 +383,7 @@ void revaliases(struct passwd *pw)
- while(fgets(buf, sizeof(buf), fp)) {
- /* Make comments invisible */
- if((p = strchr(buf, '#'))) {
-- *p = (char)NULL;
-+ *p = '\0';
- }
-
- /* Ignore malformed lines and comments */
-@@ -519,11 +518,11 @@ void rcpt_save(char *str)
- #endif
-
- /* Ignore missing usernames */
-- if(*str == (char)NULL) {
-+ if(*str == '\0') {
- return;
- }
-
-- if((rt->string = strdup(str)) == (char *)NULL) {
-+ if((rt->string = strdup(str)) == NULL) {
- die("rcpt_save() -- strdup() failed");
- }
-
-@@ -548,7 +547,7 @@ void rcpt_parse(char *str)
- (void)fprintf(stderr, "*** rcpt_parse(): str = [%s]\n", str);
- #endif
-
-- if((p = strdup(str)) == (char *)NULL) {
-+ if((p = strdup(str)) == NULL) {
- die("rcpt_parse(): strdup() failed");
- }
- q = p;
-@@ -576,7 +575,7 @@ void rcpt_parse(char *str)
- }
-
- /* End of string? */
-- if(*(q + 1) == (char)NULL) {
-+ if(*(q + 1) == '\0') {
- got_addr = True;
- }
-
-@@ -584,7 +583,7 @@ void rcpt_parse(char *str)
- if((*q == ',') && (in_quotes == False)) {
- got_addr = True;
-
-- *q = (char)NULL;
-+ *q = '\0';
- }
-
- if(got_addr) {
-@@ -668,7 +667,7 @@ void header_save(char *str)
- (void)fprintf(stderr, "header_save(): str = [%s]\n", str);
- #endif
-
-- if((p = strdup(str)) == (char *)NULL) {
-+ if((p = strdup(str)) == NULL) {
- die("header_save() -- strdup() failed");
- }
- ht->string = p;
-@@ -676,7 +675,7 @@ void header_save(char *str)
- if(strncasecmp(ht->string, "From:", 5) == 0) {
- #if 1
- /* Hack check for NULL From: line */
-- if(*(p + 6) == (char)NULL) {
-+ if(*(p + 6) == '\0') {
- return;
- }
- #endif
-@@ -739,19 +738,19 @@ header_parse() -- Break headers into sep
- void header_parse(FILE *stream)
- {
- size_t size = BUF_SZ, len = 0;
-- char *p = (char *)NULL, *q;
-+ char *p = NULL, *q;
- bool_t in_header = True;
-- char l = (char)NULL;
-+ char l = '\0';
- int c;
-
- while(in_header && ((c = fgetc(stream)) != EOF)) {
- /* Must have space for up to two more characters, since we
- may need to insert a '\r' */
-- if((p == (char *)NULL) || (len >= (size - 1))) {
-+ if((p == NULL) || (len >= (size - 1))) {
- size += BUF_SZ;
-
- p = (char *)realloc(p, (size * sizeof(char)));
-- if(p == (char *)NULL) {
-+ if(p == NULL) {
- die("header_parse() -- realloc() failed");
- }
- q = (p + len);
-@@ -776,9 +775,9 @@ void header_parse(FILE *stream)
- in_header = False;
-
- default:
-- *q = (char)NULL;
-+ *q = '\0';
- if((q = strrchr(p, '\n'))) {
-- *q = (char)NULL;
-+ *q = '\0';
- }
- header_save(p);
-
-@@ -809,9 +808,9 @@ void header_parse(FILE *stream)
- in_header = False;
-
- default:
-- *q = (char)NULL;
-+ *q = '\0';
- if((q = strrchr(p, '\n'))) {
-- *q = (char)NULL;
-+ *q = '\0';
- }
- header_save(p);
-
-@@ -876,11 +875,11 @@ bool_t read_config()
- char *rightside;
- /* Make comments invisible */
- if((p = strchr(buf, '#'))) {
-- *p = (char)NULL;
-+ *p = '\0';
- }
-
- /* Ignore malformed lines and comments */
-- if(strchr(buf, '=') == (char *)NULL) continue;
-+ if(strchr(buf, '=') == NULL) continue;
-
- /* Parse out keywords */
- p=firsttok(&begin, "= \t\n");
-@@ -890,7 +889,7 @@ bool_t read_config()
- }
- if(p && q) {
- if(strcasecmp(p, "Root") == 0) {
-- if((root = strdup(q)) == (char *)NULL) {
-+ if((root = strdup(q)) == NULL) {
- die("parse_config() -- strdup() failed");
- }
-
-@@ -904,7 +903,7 @@ bool_t read_config()
- port = atoi(r);
- }
-
-- if((mailhost = strdup(q)) == (char *)NULL) {
-+ if((mailhost = strdup(q)) == NULL) {
- die("parse_config() -- strdup() failed");
- }
-
-@@ -949,7 +948,7 @@ bool_t read_config()
- mail_domain = strdup(q);
- }
-
-- if(mail_domain == (char *)NULL) {
-+ if(mail_domain == NULL) {
- die("parse_config() -- strdup() failed");
- }
- rewrite_domain = True;
-@@ -1025,7 +1024,7 @@ bool_t read_config()
- }
- }
- else if(strcasecmp(p, "TLSCert") == 0) {
-- if((tls_cert = strdup(q)) == (char *)NULL) {
-+ if((tls_cert = strdup(q)) == NULL) {
- die("parse_config() -- strdup() failed");
- }
-
-@@ -1036,7 +1035,7 @@ bool_t read_config()
- #endif
- /* Command-line overrides these */
- else if(strcasecmp(p, "AuthUser") == 0 && !auth_user) {
-- if((auth_user = strdup(q)) == (char *)NULL) {
-+ if((auth_user = strdup(q)) == NULL) {
- die("parse_config() -- strdup() failed");
- }
-
-@@ -1045,7 +1044,7 @@ bool_t read_config()
- }
- }
- else if(strcasecmp(p, "AuthPass") == 0 && !auth_pass) {
-- if((auth_pass = strdup(q)) == (char *)NULL) {
-+ if((auth_pass = strdup(q)) == NULL) {
- die("parse_config() -- strdup() failed");
- }
-
-@@ -1054,7 +1053,7 @@ bool_t read_config()
- }
- }
- else if(strcasecmp(p, "AuthMethod") == 0 && !auth_method) {
-- if((auth_method = strdup(q)) == (char *)NULL) {
-+ if((auth_method = strdup(q)) == NULL) {
- die("parse_config() -- strdup() failed");
- }
-
-@@ -1119,14 +1118,11 @@ int smtp_open(char *host, int port)
- char buf[(BUF_SZ + 1)];
-
- /* Init SSL stuff */
-- SSL_CTX *ctx;
-- SSL_METHOD *meth;
-+ SSL_CTX *ctx = NULL;
- X509 *server_cert;
--
- SSL_load_error_strings();
- SSLeay_add_ssl_algorithms();
-- meth=SSLv23_client_method();
-- ctx = SSL_CTX_new(meth);
-+ ctx = SSL_CTX_new(SSLv23_client_method());
- if(!ctx) {
- log_event(LOG_ERR, "No SSL support initiated\n");
- return(-1);
-@@ -1310,7 +1306,7 @@ char *fd_gets(char *buf, int size, int f
- buf[i++] = c;
- }
- }
-- buf[i] = (char)NULL;
-+ buf[i] = '\0';
-
- return(buf);
- }
-@@ -1434,14 +1430,14 @@ int ssmtp(char *argv[])
- }
-
- if((p = strtok(pw->pw_gecos, ";,"))) {
-- if((gecos = strdup(p)) == (char *)NULL) {
-+ if((gecos = strdup(p)) == NULL) {
- die("ssmtp() -- strdup() failed");
- }
- }
- revaliases(pw);
-
- /* revaliases() may have defined this */
-- if(uad == (char *)NULL) {
-+ if(uad == NULL) {
- uad = append_domain(pw->pw_name);
- }
-
-@@ -1489,7 +1485,7 @@ int ssmtp(char *argv[])
- /* Try to log in if username was supplied */
- if(auth_user) {
- #ifdef MD5AUTH
-- if(auth_pass == (char *)NULL) {
-+ if(auth_pass == NULL) {
- auth_pass = strdup("");
- }
-
-@@ -1508,7 +1504,7 @@ int ssmtp(char *argv[])
- else {
- #endif
- memset(buf, 0, bufsize);
-- to64frombits(buf, auth_user, strlen(auth_user));
-+ to64frombits(buf, (unsigned char *)auth_user, strlen(auth_user));
- if (use_oldauth) {
- outbytes += smtp_write(sock, "AUTH LOGIN %s", buf);
- }
-@@ -1520,7 +1516,7 @@ int ssmtp(char *argv[])
- }
- /* we assume server asked us for Username */
- memset(buf, 0, bufsize);
-- to64frombits(buf, auth_user, strlen(auth_user));
-+ to64frombits(buf, (unsigned char *)auth_user, strlen(auth_user));
- outbytes += smtp_write(sock, buf);
- }
-
-@@ -1530,7 +1526,7 @@ int ssmtp(char *argv[])
- }
- memset(buf, 0, bufsize);
-
-- to64frombits(buf, auth_pass, strlen(auth_pass));
-+ to64frombits(buf, (unsigned char *)auth_pass, strlen(auth_pass));
- #ifdef MD5AUTH
- }
- #endif
-@@ -1737,7 +1733,7 @@ char **parse_options(int argc, char *arg
- j = 0;
-
- add = 1;
-- while(argv[i][++j] != (char)NULL) {
-+ while(argv[i][++j] != '\0') {
- switch(argv[i][j]) {
- #ifdef INET6
- case '6':
-@@ -1755,14 +1751,14 @@ char **parse_options(int argc, char *arg
- if((!argv[i][(j + 1)])
- && argv[(i + 1)]) {
- auth_user = strdup(argv[i+1]);
-- if(auth_user == (char *)NULL) {
-+ if(auth_user == NULL) {
- die("parse_options() -- strdup() failed");
- }
- add++;
- }
- else {
- auth_user = strdup(argv[i]+j+1);
-- if(auth_user == (char *)NULL) {
-+ if(auth_user == NULL) {
- die("parse_options() -- strdup() failed");
- }
- }
-@@ -1772,14 +1768,14 @@ char **parse_options(int argc, char *arg
- if((!argv[i][(j + 1)])
- && argv[(i + 1)]) {
- auth_pass = strdup(argv[i+1]);
-- if(auth_pass == (char *)NULL) {
-+ if(auth_pass == NULL) {
- die("parse_options() -- strdup() failed");
- }
- add++;
- }
- else {
- auth_pass = strdup(argv[i]+j+1);
-- if(auth_pass == (char *)NULL) {
-+ if(auth_pass == NULL) {
- die("parse_options() -- strdup() failed");
- }
- }
-@@ -1870,14 +1866,14 @@ char **parse_options(int argc, char *arg
- case 'F':
- if((!argv[i][(j + 1)]) && argv[(i + 1)]) {
- minus_F = strdup(argv[(i + 1)]);
-- if(minus_F == (char *)NULL) {
-+ if(minus_F == NULL) {
- die("parse_options() -- strdup() failed");
- }
- add++;
- }
- else {
- minus_F = strdup(argv[i]+j+1);
-- if(minus_F == (char *)NULL) {
-+ if(minus_F == NULL) {
- die("parse_options() -- strdup() failed");
- }
- }
-@@ -1889,14 +1885,14 @@ char **parse_options(int argc, char *arg
- case 'r':
- if((!argv[i][(j + 1)]) && argv[(i + 1)]) {
- minus_f = strdup(argv[(i + 1)]);
-- if(minus_f == (char *)NULL) {
-+ if(minus_f == NULL) {
- die("parse_options() -- strdup() failed");
- }
- add++;
- }
- else {
- minus_f = strdup(argv[i]+j+1);
-- if(minus_f == (char *)NULL) {
-+ if(minus_f == NULL) {
- die("parse_options() -- strdup() failed");
- }
- }
---- a/base64.c
-+++ b/base64.c
-@@ -31,7 +31,7 @@ static const char base64val[] = {
- };
- #define DECODE64(c) (isascii(c) ? base64val[c] : BAD)
-
--void to64frombits(unsigned char *out, const unsigned char *in, int inlen)
-+void to64frombits(char *out, const unsigned char *in, int inlen)
- /* raw bytes in quasi-big-endian order to base 64 string (NUL-terminated) */
- {
- for (; inlen >= 3; inlen -= 3)
-@@ -57,7 +57,7 @@ void to64frombits(unsigned char *out, co
- *out = '\0';
- }
-
--int from64tobits(char *out, const char *in)
-+int from64tobits(unsigned char *out, const char *in)
- /* base 64 to raw bytes in quasi-big-endian order, returning count of bytes */
- {
- int len = 0;
---- a/ssmtp.h
-+++ b/ssmtp.h
-@@ -41,5 +41,5 @@ typedef struct string_list rcpt_t;
- void get_arpadate(char *);
-
- /* base64.c */
--void to64frombits(unsigned char *, const unsigned char *, int);
--int from64tobits(char *, const char *);
-+void to64frombits(char *, const unsigned char *, int);
-+int from64tobits(unsigned char *, const char *);
projects / feed / packages.git / commitdiff