summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--alpine/osdep/mswin.rc2
-rw-r--r--imap/src/c-client/http.c16
-rw-r--r--imap/src/osdep/nt/ssl_win.c12
-rw-r--r--pico/mswinver.c2
-rw-r--r--pico/osdep/mswin.rc16
-rw-r--r--pith/pine.hlp2
6 files changed, 24 insertions, 26 deletions
diff --git a/alpine/osdep/mswin.rc b/alpine/osdep/mswin.rc
index ca4e129c..8df4aa9e 100644
--- a/alpine/osdep/mswin.rc
+++ b/alpine/osdep/mswin.rc
@@ -269,7 +269,7 @@ BEGIN
#endif
VALUE "FileVersion", "2.21.99999\0"
VALUE "InternalName", "alpine\0"
- VALUE "LegalCopyright", "Copyright 2006-2009 University of Washington, Copyright 2013-2014\0"
+ VALUE "LegalCopyright", "Copyright 2013-2020 Eduardo Chappa, Copyright 2006-2009 University of Washington, Copyright 2013-2014\0"
VALUE "OriginalFilename", "alpine.exe\0"
VALUE "ProductName", "alpine\0"
VALUE "ProductVersion", "2.21.99999\0"
diff --git a/imap/src/c-client/http.c b/imap/src/c-client/http.c
index 5e9f8aa8..7d95112b 100644
--- a/imap/src/c-client/http.c
+++ b/imap/src/c-client/http.c
@@ -370,7 +370,7 @@ http_add_header_data(HTTPSTREAM *stream, char *hdata)
/* extract header name first */
if((h = strchr(hdata, ':'))){
*h = '\0';
- hname = fs_get(h-hdata+1);
+ hname = fs_get((h-hdata+2)*sizeof(char));
strncpy(hname, hdata, h-hdata);
hname[h-hdata] = '\0';
if(!valid_token_name(hname))
@@ -738,7 +738,7 @@ char *
http_request_line(char *method, char *target, char *version)
{
int len = strlen(method) + strlen(target) + strlen(version) + 2 + 1;
- char *line = fs_get(len);
+ char *line = fs_get(len*sizeof(char));
sprintf(line, "%s %s %s", method, target, version);
return line;
@@ -756,7 +756,7 @@ http_add_header(HTTP_REQUEST_S **reqp, char *name, char *value)
len = strlen(name) + 2 + strlen(value) + 2 + 1;
hlen = (*reqp)->header ? strlen((*reqp)->header) : 0;
len += hlen;
- fs_resize((void **) &(*reqp)->header, len);
+ fs_resize((void **) &(*reqp)->header, len*sizeof(char));
sprintf((*reqp)->header + hlen, "%s: %s\015\012", name, value);
}
@@ -768,7 +768,7 @@ buffer_add(char **bufp, char *text)
if(!bufp || !text || !*text) return;
len = *bufp ? strlen(*bufp) : 0;
- fs_resize((void **) bufp, len + strlen(text) + 1);
+ fs_resize((void **) bufp, (len + strlen(text) + 1)*sizeof(char));
(*bufp)[len] = '\0';
strcat(*bufp, text);
}
@@ -820,7 +820,7 @@ char *
hex_escape_url_part(char *text, char *addsafe)
{
char *safechars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_.-";
- char *s = fs_get(3*strlen(text) + 1), *t;
+ char *s = fs_get((3*strlen(text) + 1)*sizeof(char)), *t;
*s = '\0';
for(t = text; *t != '\0'; t++)
@@ -829,7 +829,7 @@ hex_escape_url_part(char *text, char *addsafe)
sprintf(s + strlen(s), "%c", *t);
else
sprintf(s + strlen(s), "%%%X", *t);
- fs_resize((void **) &s, strlen(s)+1);
+ fs_resize((void **) &s, (strlen(s)+1)*sizeof(char));
return s;
}
@@ -838,7 +838,7 @@ char *
encode_url_body_part(char *text, char *addsafe)
{
char *safechars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_.-";
- char *s = fs_get(3*strlen(text) + 1), *t;
+ char *s = fs_get((3*strlen(text) + 1)*sizeof(char)), *t;
*s = '\0';
for(t = text; *t != '\0'; t++)
@@ -849,7 +849,7 @@ encode_url_body_part(char *text, char *addsafe)
sprintf(s + strlen(s), "%c", *t);
else
sprintf(s + strlen(s), "%%%X", *t);
- fs_resize((void **) &s, strlen(s)+1);
+ fs_resize((void **) &s, (strlen(s)+1)*sizeof(char));
return s;
}
diff --git a/imap/src/osdep/nt/ssl_win.c b/imap/src/osdep/nt/ssl_win.c
index 783c080a..0e77ee3c 100644
--- a/imap/src/osdep/nt/ssl_win.c
+++ b/imap/src/osdep/nt/ssl_win.c
@@ -497,24 +497,22 @@ static char *ssl_getline_work (SSLSTREAM *stream,unsigned long *size,
return ret;
}
-char* ssl_getsize(SSLSTREAM* stream, unsigned long size)
+char *ssl_getsize(SSLSTREAM* stream, unsigned long size)
{
- char* ret = NIL;
+ char *ret = NIL;
unsigned long got = 0L, need = size, n;
- int done = 0;
- while (!done) {
+ do {
if (!ssl_getdata(stream)) return ret; /* return what we have */
n = stream->ictr < need ? stream->ictr : need;
- fs_resize((void**)&ret, got + n + 1);
+ fs_resize((void **)&ret, (got + n + 1)*sizeof(char));
memcpy(ret + got, stream->iptr, n);
ret[got + n] = '\0';
got += n;
need -= n;
stream->iptr += n;
stream->ictr -= n;
- if (need == 0L) done++;
- }
+ } while (need > 0);
return ret;
}
diff --git a/pico/mswinver.c b/pico/mswinver.c
index 56619cd3..7e43f676 100644
--- a/pico/mswinver.c
+++ b/pico/mswinver.c
@@ -13,7 +13,7 @@
*/
#define VER_MAJOR 5
-#define VER_MINOR 5
+#define VER_MINOR 10
extern char datestamp[];
diff --git a/pico/osdep/mswin.rc b/pico/osdep/mswin.rc
index e9305034..3f568c6b 100644
--- a/pico/osdep/mswin.rc
+++ b/pico/osdep/mswin.rc
@@ -177,7 +177,7 @@ END
STRINGTABLE DISCARDABLE
BEGIN
- IDS_BYLINE "Copyright 2006-2009 University of Washington"
+ IDS_BYLINE "Copyright 2013-2020 Eduardo Chappa, Copyright 2006-2009 University of Washington"
IDS_APPNAME "Pico"
IDS_APPIDENT "pico"
END
@@ -189,8 +189,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,09,0,0
- PRODUCTVERSION 5,09,0,0
+ FILEVERSION 5,10,0,0
+ PRODUCTVERSION 5,10,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -205,15 +205,15 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "Comments", "see http://www.washington.edu/pine\0"
- VALUE "CompanyName", "University of Washington\0"
+ VALUE "Comments", "see http://alpine.x10host.com/alpine/release\0"
+ VALUE "CompanyName", "Patches for Alpine\0"
VALUE "FileDescription", "Pico\0"
- VALUE "FileVersion", "5.09\0"
+ VALUE "FileVersion", "5.10\0"
VALUE "InternalName", "pico\0"
- VALUE "LegalCopyright", "Copyright 2006-2009\0"
+ VALUE "LegalCopyright", "Copyright 2013-2020\0"
VALUE "OriginalFilename", "pico.exe\0"
VALUE "ProductName", " pico\0"
- VALUE "ProductVersion", "5.09\0"
+ VALUE "ProductVersion", "5.10\0"
END
END
BLOCK "VarFileInfo"
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 018b30d0..27dadcf7 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any
reasonable place to be called from.
Dummy change to get revision in pine.hlp
============= h_revision =================
-Alpine Commit 390 2020-01-17 15:48:19
+Alpine Commit 391 2020-01-18 02:21:08
============= h_news =================
<HTML>
<HEAD>
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-22 08:50:31 +0000