more fixed intendation

This commit is contained in:
Benedikt Galbavy 2023-10-21 21:53:48 +02:00
parent 12667397e7
commit b520b14d93

View File

@ -96,84 +96,84 @@ int main(int argc, char **argv)
if (buffer[size - 2] == '\r' && buffer[size - 1] == '\n')
{
size -= 2;
buffer[size] = 0;
}
else if (buffer[size - 1] == '\n')
{
--size;
buffer[size] = 0;
}
buffer[size] = 0;
}
else if (buffer[size - 1] == '\n')
{
--size;
buffer[size] = 0;
}
isQuit = strcmp(buffer, "QUIT") == 0;
isQuit = strcmp(buffer, "QUIT") == 0;
if (strcmp(buffer, "SEND") == 0)
if (strcmp(buffer, "SEND") == 0)
{
char sender[BUF], receiver[BUF], subject[81], message[BUF * 10];
printf("Sender: ");
fgets(sender, BUF - 1, stdin);
printf("Receiver: ");
fgets(receiver, BUF - 1, stdin);
printf("Subject: ");
fgets(subject, 80, stdin);
printf("Message: ");
char line[BUF];
message[0] = '\0';
while (true)
{
char sender[BUF], receiver[BUF], subject[81], message[BUF * 10];
printf("Sender: ");
fgets(sender, BUF - 1, stdin);
printf("Receiver: ");
fgets(receiver, BUF - 1, stdin);
printf("Subject: ");
fgets(subject, 80, stdin);
printf("Message: ");
char line[BUF];
message[0] = '\0';
while (true)
{
fgets(line, BUF - 1, stdin);
if (strcmp(line, ".\n") == 0)
break;
strcat(message, line);
}
snprintf(buffer, sizeof(buffer), "SEND\n%s%s%s%s.\n", sender, receiver, subject, message);
}
else if (strcmp(buffer, "LIST") == 0)
{
char username[BUF];
printf("Username: ");
fgets(username, BUF - 1, stdin);
snprintf(buffer, sizeof(buffer), "LIST\n%s", username);
}
else if (strcmp(buffer, "READ") == 0)
{
char username[BUF], msgNum[10];
printf("Username: ");
fgets(username, BUF - 1, stdin);
printf("Message Number: ");
fgets(msgNum, 9, stdin);
snprintf(buffer, sizeof(buffer), "READ\n%s%s", username, msgNum);
}
else if (strcmp(buffer, "DEL") == 0)
{
char username[BUF], msgNum[10];
printf("Username: ");
fgets(username, BUF - 1, stdin);
printf("Message Number: ");
fgets(msgNum, 9, stdin);
snprintf(buffer, sizeof(buffer), "DEL\n%s%s", username, msgNum);
fgets(line, BUF - 1, stdin);
if (strcmp(line, ".\n") == 0)
break;
strcat(message, line);
}
snprintf(buffer, sizeof(buffer), "SEND\n%s%s%s%s.\n", sender, receiver, subject, message);
}
else if (strcmp(buffer, "LIST") == 0)
{
char username[BUF];
printf("Username: ");
fgets(username, BUF - 1, stdin);
snprintf(buffer, sizeof(buffer), "LIST\n%s", username);
}
else if (strcmp(buffer, "READ") == 0)
{
char username[BUF], msgNum[10];
printf("Username: ");
fgets(username, BUF - 1, stdin);
printf("Message Number: ");
fgets(msgNum, 9, stdin);
snprintf(buffer, sizeof(buffer), "READ\n%s%s", username, msgNum);
}
else if (strcmp(buffer, "DEL") == 0)
{
char username[BUF], msgNum[10];
printf("Username: ");
fgets(username, BUF - 1, stdin);
printf("Message Number: ");
fgets(msgNum, 9, stdin);
snprintf(buffer, sizeof(buffer), "DEL\n%s%s", username, msgNum);
}
//////////////////////////////////////////////////////////////////////
// SEND DATA
// https://man7.org/linux/man-pages/man2/send.2.html
// send will fail if connection is closed, but does not set
// the error of send, but still the count of bytes sent
int size = strlen(buffer);
//////////////////////////////////////////////////////////////////////
// SEND DATA
// https://man7.org/linux/man-pages/man2/send.2.html
// send will fail if connection is closed, but does not set
// the error of send, but still the count of bytes sent
int size = strlen(buffer);
if ((send(create_socket, buffer, size + 1, 0)) == -1)
{
// in case the server is gone offline we will still not enter
// this part of code: see docs: https://linux.die.net/man/3/send
// >> Successful completion of a call to send() does not guarantee
// >> delivery of the message. A return value of -1 indicates only
// >> locally-detected errors.
// ... but
// to check the connection before send is sense-less because
// after checking the communication can fail (so we would need
// to have 1 atomic operation to check...)
perror("send error");
break;
}
if ((send(create_socket, buffer, size + 1, 0)) == -1)
{
// in case the server is gone offline we will still not enter
// this part of code: see docs: https://linux.die.net/man/3/send
// >> Successful completion of a call to send() does not guarantee
// >> delivery of the message. A return value of -1 indicates only
// >> locally-detected errors.
// ... but
// to check the connection before send is sense-less because
// after checking the communication can fail (so we would need
// to have 1 atomic operation to check...)
perror("send error");
break;
}
//////////////////////////////////////////////////////////////////////
// RECEIVE FEEDBACK