projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed make_bcc_file () to use contents of From: in draft, if draft_from masquerade...
[mmh]
/
uip
/
popsbr.c
diff --git
a/uip/popsbr.c
b/uip/popsbr.c
index
6d8d820
..
9d5f312
100644
(file)
--- a/
uip/popsbr.c
+++ b/
uip/popsbr.c
@@
-9,6
+9,7
@@
*/
#include <h/mh.h>
*/
#include <h/mh.h>
+#include <h/utils.h>
extern int client(char *args, char *protocol, char *service, int rproto,
char *response, int len_response);
extern int client(char *args, char *protocol, char *service, int rproto,
char *response, int len_response);
@@
-432,10
+433,7
@@
sasl_get_pass(sasl_conn_t *conn, void *context, int id, sasl_secret_t **psecret)
len = strlen(pass);
len = strlen(pass);
- *psecret = (sasl_secret_t *) malloc(sizeof(sasl_secret_t) + len);
-
- if (! *psecret)
- return SASL_NOMEM;
+ *psecret = (sasl_secret_t *) mh_xmalloc(sizeof(sasl_secret_t) + len);
(*psecret)->len = len;
strcpy((char *) (*psecret)->data, pass);
(*psecret)->len = len;
strcpy((char *) (*psecret)->data, pass);
@@
-476,8
+474,8
@@
parse_proxy(char *proxy, char *host)
}
/* put together list of arguments */
}
/* put together list of arguments */
- p = pargv = malloc(pargc * sizeof(char *));
- c = *pargv = malloc(plen * sizeof(char));
+ p = pargv = mh_xmalloc(pargc * sizeof(char *));
+ c = *pargv = mh_xmalloc(plen * sizeof(char));
for (cur = pro; *cur; cur++) {
if (isspace(*cur) && cur[1] && !isspace(cur[1])) {
*c++ = '\0';
for (cur = pro; *cur; cur++) {
if (isspace(*cur) && cur[1] && !isspace(cur[1])) {
*c++ = '\0';
@@
-500,6
+498,13
@@
pop_init (char *host, char *user, char *pass, char *proxy, int snoop,
int fd1, fd2;
char buffer[BUFSIZ];
int fd1, fd2;
char buffer[BUFSIZ];
+#ifdef APOP
+ int apop;
+
+ if ((apop = rpop) < 0)
+ rpop = 0;
+#endif
+
if (proxy && *proxy) {
int pid;
int inpipe[2]; /* for reading from the server */
if (proxy && *proxy) {
int pid;
int inpipe[2]; /* for reading from the server */
@@
-549,13
+554,6
@@
pop_init (char *host, char *user, char *pass, char *proxy, int snoop,
} else {
} else {
-#ifdef APOP
- int apop;
-
- if ((apop = rpop) < 0)
- rpop = 0;
-#endif
-
#ifndef NNTP
if ( kpop ) {
# ifdef KPOP
#ifndef NNTP
if ( kpop ) {
# ifdef KPOP
@@
-1240,12
+1238,7
@@
sasl_fgetc(FILE *f)
}
if (retbufsize > size) {
}
if (retbufsize > size) {
- buffer = realloc(buffer, retbufsize);
- if (!buffer) {
- snprintf(response, sizeof(response), "Error during realloc in "
- "read routine: %s", strerror(errno));
- return -2;
- }
+ buffer = mh_xrealloc(buffer, retbufsize);
size = retbufsize;
}
size = retbufsize;
}