mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

Don't declare malloc, realloc, free.

Browse source 
Don't include string.h or strings.h.
Include des.h before krb.h.
Do declare my_strstr.
(getline): Really use my_strstr.
Leave one empty place in server->buffer,
and put a null at the end of the data in it.
This commit is contained in:
Richard M. Stallman 1994-10-18 07:34:59 +00:00
parent 0178cafafc
commit 7a481e50f6
1 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib-src/pop.c
View file

@ -26,10 +26,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include <pop.h> #include <pop.h>
#ifdef sun #ifdef sun
#include <malloc.h> #include <malloc.h>
#else
extern char *malloc (/* unsigned */);
extern char *realloc (/* char *, unsigned */);
extern void free (/* char * */);
#endif #endif
#endif #endif
#ifdef HESIOD #ifdef HESIOD
@ -43,15 +39,13 @@ extern void free (/* char * */);
extern struct servent *hes_getservbyname (/* char *, char * */); extern struct servent *hes_getservbyname (/* char *, char * */);
#endif #endif
#include <pwd.h> #include <pwd.h>
#include <string.h>
#include <strings.h>
#include <netdb.h> #include <netdb.h>
#include <errno.h> #include <errno.h>
#include <stdio.h> #include <stdio.h>
#ifdef KERBEROS #ifdef KERBEROS
#ifndef KRB5 #ifndef KRB5
#include <krb.h>
#include <des.h> #include <des.h>
#include <krb.h>
#else /* KRB5 */ #else /* KRB5 */
#include <krb5/krb5.h> #include <krb5/krb5.h>
#include <krb5/ext-proto.h> #include <krb5/ext-proto.h>
@ -85,6 +79,8 @@ static int gettermination (/* popserver */);
#endif #endif
static void pop_trash (/* popserver */); static void pop_trash (/* popserver */);
static char *my_strstr ();
#define ERROR_MAX 80 /* a pretty arbitrary size */ #define ERROR_MAX 80 /* a pretty arbitrary size */
#define POP_PORT 110 #define POP_PORT 110
#define KPOP_PORT 1109 #define KPOP_PORT 1109
@ -1171,7 +1167,7 @@ getline (server)
if (server->data) if (server->data)
{ {
char *cp = strstr (server->buffer + server->buffer_index, "\r\n"); char *cp = my_strstr (server->buffer + server->buffer_index, "\r\n");
if (cp) if (cp)
{ {
int found; int found;
@ -1214,7 +1210,7 @@ getline (server)
} }
} }
ret = read (server->file, server->buffer + server->data, ret = read (server->file, server->buffer + server->data,
server->buffer_size - server->data); server->buffer_size - server->data - 1);
if (ret < 0) if (ret < 0)
{ {
strcpy (pop_error, GETLINE_ERROR); strcpy (pop_error, GETLINE_ERROR);
@ -1231,9 +1227,11 @@ getline (server)
} }
else else
{ {
char *cp = strstr (server->buffer, "\r\n"); char *cp;
server->data += ret; server->data += ret;
server->buffer[server->data] = '\0';
cp = my_strstr (server->buffer, "\r\n");
if (cp) if (cp)
{ {
int data_used = (cp + 2) - server->buffer; int data_used = (cp + 2) - server->buffer;