Revision: 5470
http://ipcop.svn.sourceforge.net/ipcop/?rev=5470&view=rev
Author: eoberlander
Date: 2011-02-20 09:49:36 +0000 (Sun, 20 Feb 2011)
Log Message:
-----------
Fix some typos, add some newlines.
Modified Paths:
--------------
ipcop/trunk/src/misc-progs/emailhelper.c
Modified: ipcop/trunk/src/misc-progs/emailhelper.c
===================================================================
--- ipcop/trunk/src/misc-progs/emailhelper.c 2011-02-20 06:48:07 UTC (rev
5469)
+++ ipcop/trunk/src/misc-progs/emailhelper.c 2011-02-20 09:49:36 UTC (rev
5470)
@@ -62,10 +62,10 @@
printf("Options:\n");
printf(" -s, --subject=SUBJECT Email subject\n");
printf(" -m, --messagefile=FILE File with the email text as content\n");
- printf(" -d, --delete Delete messagefile when email was
send\n");
+ printf(" -d, --delete Delete messagefile when email sent\n");
printf(" -a, --attachment=FILE File which will be attached to
email\n");
- printf(" -v, --verbose be verbose\n");
- printf(" --help display this help and exit\n");
+ printf(" -v, --verbose be verbose\n");
+ printf(" --help display this help and exit\n");
exit(exit_code);
}
@@ -173,15 +173,15 @@
verbose_printf(2, "Validate EMAIL_SERVER ... \n");
if (!(strlen(server))) {
- fprintf(stderr, "Email server can not be empty\n");
+ fprintf(stderr, "Email server cannot be empty\n");
exit(EMAIL_ERR_SERVER);
}
else if (strchr(server, ' ')) {
- fprintf(stderr, "Email server can not contain spaces");
+ fprintf(stderr, "Email server cannot contain spaces\n");
exit(EMAIL_ERR_SERVER);
}
else if (strlen(server) != strspn(server,
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-.")) {
- fprintf(stderr, "Email server contains not valid chars");
+ fprintf(stderr, "Email server contains non valid chars\n");
exit(EMAIL_ERR_SERVER);
}
@@ -195,11 +195,11 @@
verbose_printf(2, "Validate EMAIL_SERVER_PORT ... \n");
if (strchr(opt_port, ' ')) {
- fprintf(stderr, "Email server port can not contain spaces");
+ fprintf(stderr, "Email server port cannot contain spaces\n");
exit(EMAIL_ERR_PORT);
}
else if (strlen(opt_port) != strspn(opt_port, NUMBERS)) {
- fprintf(stderr, "Email server port contains not valid chars");
+ fprintf(stderr, "Email server port contains non valid chars\n");
exit(EMAIL_ERR_PORT);
}
else if (strlen(opt_port)) {
@@ -221,11 +221,11 @@
verbose_printf(2, "Validate EMAIL_USR ... \n");
if (strchr(opt_user, ' ')) {
- fprintf(stderr, "Username port can not contain spaces");
+ fprintf(stderr, "Username cannot contain spaces\n");
exit(EMAIL_ERR_USR);
}
else if (strlen(opt_user) != strspn(opt_user, LETTERS_NUMBERS)) {
- fprintf(stderr, "Username contains not valid chars");
+ fprintf(stderr, "Username contains non valid chars\n");
exit(EMAIL_ERR_USR);
}
else if (strlen(opt_user)) {
@@ -247,11 +247,11 @@
verbose_printf(2, "Validate EMAIL_PW ... \n");
if (strchr(opt_password, ' ')) {
- fprintf(stderr, "Password can not contain spaces");
+ fprintf(stderr, "Password cannot contain spaces\n");
exit(EMAIL_ERR_PW);
}
else if (strchr(opt_password, '"') || strstr(opt_password, "'")) {
- fprintf(stderr, "Password can not contain simple or double quote");
+ fprintf(stderr, "Password cannot contain single or double quotes\n");
exit(EMAIL_ERR_PW);
}
else if (strlen(opt_password)) {
@@ -273,15 +273,15 @@
verbose_printf(2, "Validate EMAIL_FROM ... \n");
if (!(strlen(from))) {
- fprintf(stderr, "From email can not be empty\n");
+ fprintf(stderr, "From email cannot be empty\n");
exit(EMAIL_ERR_FROM);
}
else if (strchr(from, ' ')) {
- fprintf(stderr, "From email can not contain spaces");
+ fprintf(stderr, "From email cannot contain spaces\n");
exit(EMAIL_ERR_FROM);
}
else if (strlen(from) != strspn(from, LETTERS_NUMBERS "-_.@")) {
- fprintf(stderr, "From email contains not valid chars");
+ fprintf(stderr, "From email contains non valid chars\n");
exit(EMAIL_ERR_FROM);
}
@@ -295,15 +295,15 @@
verbose_printf(2, "Validate EMAIL_TO ... \n");
if (!(strlen(to))) {
- fprintf(stderr, "To email can not be empty\n");
+ fprintf(stderr, "To email cannot be empty\n");
exit(EMAIL_ERR_TO);
}
else if (strchr(to, ' ')) {
- fprintf(stderr, "To email can not contain spaces");
+ fprintf(stderr, "To email cannot contain spaces\n");
exit(EMAIL_ERR_TO);
}
else if (strlen(to) != strspn(to, LETTERS_NUMBERS "-_.@")) {
- fprintf(stderr, "To email contains not valid chars");
+ fprintf(stderr, "To email contains non valid chars\n");
exit(EMAIL_ERR_TO);
}
@@ -360,7 +360,7 @@
if (flag_attachment) {
if (access(opt_attachment, 0) == -1) {
- verbose_printf(2, "Attachement is not available \n");
+ verbose_printf(2, "Attachment is not available \n");
exit(EMAIL_ERR_ATTACH);
}
else {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
