Version 2.6.1-3

SVN revision: 1668
This commit is contained in:
Stefan Ritt 2006-02-23 14:38:19 +00:00
parent b20ee70664
commit fac1c1313b
4 changed files with 8 additions and 8 deletions

View File

@ -5,7 +5,7 @@
Contents: Conversion program for ELOG messages Contents: Conversion program for ELOG messages
$Id:$ $Id$
\********************************************************************/ \********************************************************************/

View File

@ -5,7 +5,7 @@
Contents: Electronic logbook utility Contents: Electronic logbook utility
$Id:$ $Id$
\********************************************************************/ \********************************************************************/
@ -248,7 +248,7 @@ void add_crlf(char *buffer, int bufsize)
strlcpy(tmpbuf, p, bufsize); strlcpy(tmpbuf, p, bufsize);
*(p++) = '\r'; *(p++) = '\r';
strlcpy(p, tmpbuf, bufsize - ( p - buffer)); strlcpy(p, tmpbuf, bufsize - (p - buffer));
p++; p++;
} }
@ -1024,7 +1024,7 @@ int main(int argc, char *argv[])
size = (INT) lseek(fh, 0, SEEK_END); size = (INT) lseek(fh, 0, SEEK_END);
lseek(fh, 0, SEEK_SET); lseek(fh, 0, SEEK_SET);
if (size > (INT)(sizeof(text) - 1)) { if (size > (INT) (sizeof(text) - 1)) {
printf("Message file \"%s\" is too long (%zd bytes max).\n", textfile, sizeof(text)); printf("Message file \"%s\" is too long (%zd bytes max).\n", textfile, sizeof(text));
return 1; return 1;
} }

View File

@ -1028,8 +1028,8 @@ int subst_shell(char *cmd, char *result, int size)
#ifdef OS_UNIX #ifdef OS_UNIX
pid_t pid; pid_t pid;
int fh; int fh;
char str[256]; char str[256];
if ((pid = fork()) < 0) if ((pid = fork()) < 0)
return 0; return 0;
@ -15433,7 +15433,7 @@ BOOL is_command_allowed(LOGBOOK * lbs, char *command)
/* only allow Submit & Co if "New" is allowed */ /* only allow Submit & Co if "New" is allowed */
if (strstr(menu_str, "New")) if (strstr(menu_str, "New"))
strlcat(other_str, "Update, Upload, Submit, Save, ", sizeof(other_str)); strlcat(other_str, "Update, Upload, Submit, Save, ", sizeof(other_str));
/* add save for new user registration */ /* add save for new user registration */
if (isparam("new_user_name")) if (isparam("new_user_name"))
strlcat(other_str, "Save, ", sizeof(other_str)); strlcat(other_str, "Save, ", sizeof(other_str));

View File

@ -6,7 +6,7 @@
Contents: Extract all localization strings from elogd and put Contents: Extract all localization strings from elogd and put
them into eloglang.xxxx them into eloglang.xxxx
$Id:$ $Id$
\********************************************************************/ \********************************************************************/