Fixed Windows isues

This commit is contained in:
Stefan Ritt 2014-10-23 12:37:48 +02:00
parent 72a8401f14
commit 5fb80f82fe
7 changed files with 17 additions and 4 deletions

8
.gitignore vendored
View File

@ -10,3 +10,11 @@ elog
logbooks/* logbooks/*
locext locext
git-revision.h git-revision.h
*.tlog
*.sbr
*.pdb
*.obj
*.sdf
*.suo
NT/Debug/
*.user

View File

@ -18,6 +18,7 @@
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc> <UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>

View File

@ -18,6 +18,7 @@
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc> <UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>

View File

@ -23,6 +23,7 @@
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc> <UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">

View File

@ -23,6 +23,7 @@
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc> <UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">

View File

@ -26493,7 +26493,7 @@ void show_uploader_json(LOGBOOK *lbs)
{ {
char charset[256]; char charset[256];
char filename[256], thumbname[256], attchname[256]; char filename[256], thumbname[256], attchname[256];
int i, j; int i, j, attch_count;
// maximum number of files that can be uploaded this way (drag and drop into the editor) // maximum number of files that can be uploaded this way (drag and drop into the editor)
const long MAX_FILE_COUNT = 100; const long MAX_FILE_COUNT = 100;
@ -26511,7 +26511,7 @@ void show_uploader_json(LOGBOOK *lbs)
strcpy(charset, DEFAULT_HTTP_CHARSET); strcpy(charset, DEFAULT_HTTP_CHARSET);
rsprintf("Content-Type: application/json;charset=%s\r\n\r\n", charset); rsprintf("Content-Type: application/json;charset=%s\r\n\r\n", charset);
long attch_count = strtol(getparam("drop-count"), NULL, 10); attch_count = strtol(getparam("drop-count"), NULL, 10);
// limit the number of files that can be uploaded // limit the number of files that can be uploaded
if(attch_count > MAX_FILE_COUNT) { if(attch_count > MAX_FILE_COUNT) {
@ -26587,7 +26587,7 @@ void interprete(char *lbook, char *path)
edit_id[80], file_name[256], command[256], enc_path[256], dec_path[256], uname[80], edit_id[80], file_name[256], command[256], enc_path[256], dec_path[256], uname[80],
full_name[256], user_email[256], logbook[256], logbook_enc[256], *experiment, full_name[256], user_email[256], logbook[256], logbook_enc[256], *experiment,
group[256], css[256], *pfile, attachment[MAX_PATH_LENGTH], str3[NAME_LENGTH], group[256], css[256], *pfile, attachment[MAX_PATH_LENGTH], str3[NAME_LENGTH],
thumb_name[256], sid[32], error_str[256]; thumb_name[256], sid[32], error_str[256], *s;
LOGBOOK *lbs; LOGBOOK *lbs;
FILE *f; FILE *f;
@ -26617,7 +26617,7 @@ void interprete(char *lbook, char *path)
rsputs(loc(getparam("value"))); rsputs(loc(getparam("value")));
/* dummy strings for JS-only translations */ /* dummy strings for JS-only translations */
char *s = loc("Drop attachments here..."); s = loc("Drop attachments here...");
s = loc("Insert Timestamp"); s = loc("Insert Timestamp");
if (s) if (s)
s = NULL; // avoid compiler warning s = NULL; // avoid compiler warning

View File

@ -74,6 +74,7 @@
#include <time.h> #include <time.h>
#include <direct.h> #include <direct.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <errno.h>
#else #else