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

Moved mxml to submodule

Browse Source
This commit is contained in:
Stefan Ritt 2016-12-01 10:29:07 +01:00
parent 9a18b27ead
commit bf25ce7e61
5 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "mxml"]
path = mxml
url = git@bitbucket.org:tmidas/mxml.git

8
Makefile
View File

@ -128,11 +128,11 @@ crypt.o: src/crypt.c
auth.o: src/auth.c auth.o: src/auth.c
$(CC) $(CFLAGS) -w -c -o auth.o src/auth.c $(CC) $(CFLAGS) -w -c -o auth.o src/auth.c
mxml.o: src/mxml.c src/mxml.h mxml.o: mxml/mxml.c mxml/mxml.h
$(CC) $(CFLAGS) -c -o mxml.o src/mxml.c $(CC) $(CFLAGS) -c -o mxml.o mxml/mxml.c
strlcpy.o: src/strlcpy.c src/strlcpy.h strlcpy.o: mxml/strlcpy.c mxml/strlcpy.h
$(CC) $(CFLAGS) -c -o strlcpy.o src/strlcpy.c $(CC) $(CFLAGS) -c -o strlcpy.o mxml/strlcpy.c
elogd: src/elogd.c regex.o crypt.o auth.o mxml.o $(GIT_REVISION) elogd: src/elogd.c regex.o crypt.o auth.o mxml.o $(GIT_REVISION)
$(CC) $(CFLAGS) -o elogd src/elogd.c crypt.o auth.o regex.o mxml.o $(OBJS) $(LIBS) $(CC) $(CFLAGS) -o elogd src/elogd.c crypt.o auth.o regex.o mxml.o $(OBJS) $(LIBS)

1
mxml Submodule

@ -0,0 +1 @@
Subproject commit 15c5f5c6764f99e9974c6ea40f5a58f2d21285d6

2
src/elogd.c
View File

@ -13837,7 +13837,7 @@ void show_config_page(LOGBOOK * lbs)
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
if (sort_email) { if (sort_email) {
strlcpy(user_email, user_list[i], NAME_LENGTH); strlcpy(user_email, user_list[i], sizeof(user_email));
user_list[i][0] = 0; user_list[i][0] = 0;
get_user_line(lbs, user_list[i], NULL, full_name, user_email, NULL, NULL, NULL); get_user_line(lbs, user_list[i], NULL, full_name, user_email, NULL, NULL, NULL);
} else } else

32
xcode/elogd.xcodeproj/project.pbxproj
View File

@ -7,8 +7,8 @@
objects = { objects = {
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
D52BA31413999DE4000458E3 /* mxml.c in Sources */ = {isa = PBXBuildFile; fileRef = D52BA31013999DE4000458E3 /* mxml.c */; }; D52896561DF0221200E8F981 /* mxml.c in Sources */ = {isa = PBXBuildFile; fileRef = D52896541DF0221200E8F981 /* mxml.c */; };
D52BA31513999DE4000458E3 /* strlcpy.c in Sources */ = {isa = PBXBuildFile; fileRef = D52BA31213999DE4000458E3 /* strlcpy.c */; }; D52896591DF0222200E8F981 /* strlcpy.c in Sources */ = {isa = PBXBuildFile; fileRef = D52896571DF0222200E8F981 /* strlcpy.c */; };
D54515921399A23B0037D7FB /* auth.c in Sources */ = {isa = PBXBuildFile; fileRef = D545158C1399A23B0037D7FB /* auth.c */; }; D54515921399A23B0037D7FB /* auth.c in Sources */ = {isa = PBXBuildFile; fileRef = D545158C1399A23B0037D7FB /* auth.c */; };
D54515931399A23B0037D7FB /* crypt.c in Sources */ = {isa = PBXBuildFile; fileRef = D545158D1399A23B0037D7FB /* crypt.c */; }; D54515931399A23B0037D7FB /* crypt.c in Sources */ = {isa = PBXBuildFile; fileRef = D545158D1399A23B0037D7FB /* crypt.c */; };
D54515941399A23B0037D7FB /* elogd.c in Sources */ = {isa = PBXBuildFile; fileRef = D545158E1399A23B0037D7FB /* elogd.c */; }; D54515941399A23B0037D7FB /* elogd.c in Sources */ = {isa = PBXBuildFile; fileRef = D545158E1399A23B0037D7FB /* elogd.c */; };
@ -30,13 +30,13 @@
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
D504812F1ACC49DD002EDA66 /* git-revision.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "git-revision.h"; path = "../src/git-revision.h"; sourceTree = "<group>"; }; D504812F1ACC49DD002EDA66 /* git-revision.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "git-revision.h"; path = "../src/git-revision.h"; sourceTree = "<group>"; };
D51F4A9214F27F3C00CB29E9 /* index.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = index.html; path = ../doc/index.html; sourceTree = SOURCE_ROOT; }; D51F4A9214F27F3C00CB29E9 /* index.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = index.html; path = ../doc/index.html; sourceTree = SOURCE_ROOT; };
D52896541DF0221200E8F981 /* mxml.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mxml.c; path = ../../mxml/mxml.c; sourceTree = "<group>"; };
D52896551DF0221200E8F981 /* mxml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mxml.h; path = ../../mxml/mxml.h; sourceTree = "<group>"; };
D52896571DF0222200E8F981 /* strlcpy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = strlcpy.c; path = ../../mxml/strlcpy.c; sourceTree = "<group>"; };
D52896581DF0222200E8F981 /* strlcpy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = strlcpy.h; path = ../../mxml/strlcpy.h; sourceTree = "<group>"; };
D528A7C314F278C800D33974 /* ChangeLog */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ChangeLog; path = ../doc/ChangeLog; sourceTree = SOURCE_ROOT; }; D528A7C314F278C800D33974 /* ChangeLog */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = ChangeLog; path = ../doc/ChangeLog; sourceTree = SOURCE_ROOT; };
D528A7C514F278DA00D33974 /* checklist.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = checklist.txt; path = ../checklist.txt; sourceTree = SOURCE_ROOT; }; D528A7C514F278DA00D33974 /* checklist.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = checklist.txt; path = ../checklist.txt; sourceTree = SOURCE_ROOT; };
D52BA2FA13999DB0000458E3 /* elogd */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = elogd; sourceTree = BUILT_PRODUCTS_DIR; }; D52BA2FA13999DB0000458E3 /* elogd */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = elogd; sourceTree = BUILT_PRODUCTS_DIR; };
D52BA31013999DE4000458E3 /* mxml.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mxml.c; path = ../../mxml/mxml.c; sourceTree = SOURCE_ROOT; };
D52BA31113999DE4000458E3 /* mxml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mxml.h; path = ../../mxml/mxml.h; sourceTree = SOURCE_ROOT; };
D52BA31213999DE4000458E3 /* strlcpy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = strlcpy.c; path = ../../mxml/strlcpy.c; sourceTree = SOURCE_ROOT; };
D52BA31313999DE4000458E3 /* strlcpy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = strlcpy.h; path = ../../mxml/strlcpy.h; sourceTree = SOURCE_ROOT; };
D545158C1399A23B0037D7FB /* auth.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = auth.c; path = ../src/auth.c; sourceTree = SOURCE_ROOT; }; D545158C1399A23B0037D7FB /* auth.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = auth.c; path = ../src/auth.c; sourceTree = SOURCE_ROOT; };
D545158D1399A23B0037D7FB /* crypt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = crypt.c; path = ../src/crypt.c; sourceTree = SOURCE_ROOT; }; D545158D1399A23B0037D7FB /* crypt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = crypt.c; path = ../src/crypt.c; sourceTree = SOURCE_ROOT; };
D545158E1399A23B0037D7FB /* elogd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = elogd.c; path = ../src/elogd.c; sourceTree = SOURCE_ROOT; }; D545158E1399A23B0037D7FB /* elogd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = elogd.c; path = ../src/elogd.c; sourceTree = SOURCE_ROOT; };
@ -86,6 +86,10 @@
D52BA2FD13999DB0000458E3 /* elogd */ = { D52BA2FD13999DB0000458E3 /* elogd */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
D52896571DF0222200E8F981 /* strlcpy.c */,
D52896581DF0222200E8F981 /* strlcpy.h */,
D52896541DF0221200E8F981 /* mxml.c */,
D52896551DF0221200E8F981 /* mxml.h */,
D504812F1ACC49DD002EDA66 /* git-revision.h */, D504812F1ACC49DD002EDA66 /* git-revision.h */,
D545158C1399A23B0037D7FB /* auth.c */, D545158C1399A23B0037D7FB /* auth.c */,
D545158D1399A23B0037D7FB /* crypt.c */, D545158D1399A23B0037D7FB /* crypt.c */,
@ -94,10 +98,6 @@
D58A366615AF103300682DC0 /* elog-version.h */, D58A366615AF103300682DC0 /* elog-version.h */,
D54515901399A23B0037D7FB /* regex.c */, D54515901399A23B0037D7FB /* regex.c */,
D54515911399A23B0037D7FB /* regex.h */, D54515911399A23B0037D7FB /* regex.h */,
D52BA31013999DE4000458E3 /* mxml.c */,
D52BA31113999DE4000458E3 /* mxml.h */,
D52BA31213999DE4000458E3 /* strlcpy.c */,
D52BA31313999DE4000458E3 /* strlcpy.h */,
); );
path = elogd; path = elogd;
sourceTree = "<group>"; sourceTree = "<group>";
@ -155,7 +155,7 @@
D52BA2F113999DB0000458E3 /* Project object */ = { D52BA2F113999DB0000458E3 /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 0720; LastUpgradeCheck = 0810;
ORGANIZATIONNAME = PSI; ORGANIZATIONNAME = PSI;
}; };
buildConfigurationList = D52BA2F413999DB0000458E3 /* Build configuration list for PBXProject "elogd" */; buildConfigurationList = D52BA2F413999DB0000458E3 /* Build configuration list for PBXProject "elogd" */;
@ -197,10 +197,10 @@
isa = PBXSourcesBuildPhase; isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
D52BA31413999DE4000458E3 /* mxml.c in Sources */,
D52BA31513999DE4000458E3 /* strlcpy.c in Sources */,
D54515921399A23B0037D7FB /* auth.c in Sources */, D54515921399A23B0037D7FB /* auth.c in Sources */,
D52896591DF0222200E8F981 /* strlcpy.c in Sources */,
D54515931399A23B0037D7FB /* crypt.c in Sources */, D54515931399A23B0037D7FB /* crypt.c in Sources */,
D52896561DF0221200E8F981 /* mxml.c in Sources */,
D54515941399A23B0037D7FB /* elogd.c in Sources */, D54515941399A23B0037D7FB /* elogd.c in Sources */,
D54515951399A23B0037D7FB /* regex.c in Sources */, D54515951399A23B0037D7FB /* regex.c in Sources */,
); );
@ -216,7 +216,9 @@
CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
@ -247,7 +249,9 @@
CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
@ -282,6 +286,7 @@
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"-lssl", "-lssl",
"-lkrb5", "-lkrb5",
"-L/opt/local/lib",
); );
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
@ -298,6 +303,7 @@
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"-lssl", "-lssl",
"-lkrb5", "-lkrb5",
"-L/opt/local/lib",
); );
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };