Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-08 17:13:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made attachment size variable

Browse Source 
SVN revision: 259
This commit is contained in:
Stefan Ritt 2002-10-14 08:26:26 +00:00
parent e4d629db5c
commit 4ca8089ecc
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
elog.c
View File

@ -6,6 +6,9 @@
Contents: Electronic logbook utility Contents: Electronic logbook utility
$Log$ $Log$
Revision 1.10 2002/10/14 08:26:26 midas
Made attachment size variable
Revision 1.9 2002/08/02 11:01:34 midas Revision 1.9 2002/08/02 11:01:34 midas
Added -r for replies Added -r for replies
@ -112,7 +115,7 @@ char *p;
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
char request[600000], response[10000], content[600000]; char request[100000], response[100000], *content;
INT submit_elog(char *host, int port, char *subdir, char *experiment, INT submit_elog(char *host, int port, char *subdir, char *experiment,
char *passwd, char *passwd,
@ -219,6 +222,17 @@ char host_name[256], boundary[80], str[80], *p;
if (verbose) if (verbose)
printf("Successfully connected to host %s, port %d\n", host, port); printf("Successfully connected to host %s, port %d\n", host, port);
content_length = 100000;
for (i=0 ; i<MAX_ATTACHMENTS ; i++)
if (afilename[i][0])
content_length += buffer_size[i];
content = malloc(content_length);
if (content == NULL)
{
printf("Not enough memory\n");
return -1;
}
/* compose content */ /* compose content */
strcpy(boundary, "---------------------------7d0bf1a60904bc"); strcpy(boundary, "---------------------------7d0bf1a60904bc");
strcpy(content, boundary); strcpy(content, boundary);
@ -292,7 +306,6 @@ char host_name[256], boundary[80], str[80], *p;
strcat(request, "\r\n"); strcat(request, "\r\n");
header_length = strlen(request); header_length = strlen(request);
memcpy(request+header_length, content, content_length);
/* /*
{ {
@ -304,13 +317,17 @@ char host_name[256], boundary[80], str[80], *p;
*/ */
/* send request */ /* send request */
send(sock, request, header_length, 0);
if (verbose) if (verbose)
{ {
printf("Request sent to host:\n"); printf("Request sent to host:\n");
puts(request); puts(request);
} }
send(sock, request, header_length+content_length, 0); /* send content */
send(sock, content, content_length, 0);
if (verbose)
printf("Content sent to host.\n");
/* receive response */ /* receive response */
i = recv(sock, response, 10000, 0); i = recv(sock, response, 10000, 0);
@ -490,6 +507,7 @@ char attr_name[MAX_N_ATTR][NAME_LENGTH], attrib[MAX_N_ATTR][NAME_LENGTH];
if (text[0] == 0 && textfile[0] == 0) if (text[0] == 0 && textfile[0] == 0)
{ {
printf("Please specify message text either with the \"-m\" flag or directly.\n"); printf("Please specify message text either with the \"-m\" flag or directly.\n");
return 1;
} }
/*---- open text file ----*/ /*---- open text file ----*/
@ -541,11 +559,13 @@ char attr_name[MAX_N_ATTR][NAME_LENGTH], attrib[MAX_N_ATTR][NAME_LENGTH];
lseek(fh, 0, SEEK_SET); lseek(fh, 0, SEEK_SET);
buffer[i] = malloc(att_size[i]+1); buffer[i] = malloc(att_size[i]+1);
/*
if (buffer[i] == NULL || att_size[i] > 500*1024) if (buffer[i] == NULL || att_size[i] > 500*1024)
{ {
printf("Attachment file \"%s\" is too long (500k max).\n", attachment[i]); printf("Attachment file \"%s\" is too long (500k max).\n", attachment[i]);
return 1; return 1;
} }
*/
n = read(fh, buffer[i], att_size[i]); n = read(fh, buffer[i], att_size[i]);
if (n < att_size[i]) if (n < att_size[i])