[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.0.99-2-212-g7c22803
X2Go dev team
git-admin at x2go.org
Wed Dec 4 06:21:34 CET 2013
The branch, build-baikal has been updated
via 7c22803b8c79db67011fb7a2c35af5ff5a60d350 (commit)
from ef41f8d075da08aa016605504ec1e906c4e9f97f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
x2goserver/x2goprint.c | 6 +-----
x2goserver/x2gosqlitewrapper.c | 5 -----
2 files changed, 1 insertion(+), 10 deletions(-)
The diff of changes is:
diff --git a/x2goserver/x2goprint.c b/x2goserver/x2goprint.c
index 8f177ca..9151d17 100644
--- a/x2goserver/x2goprint.c
+++ b/x2goserver/x2goprint.c
@@ -28,8 +28,6 @@
#include <errno.h>
-
-
int main( int argc, char *argv[] ) {
char * x2goprint = NULL;
size_t path_max;
@@ -62,15 +60,13 @@ int main( int argc, char *argv[] ) {
exit(EXIT_FAILURE);
}
-
// derive the full path of x2goprint.pl from path of this binary
- rvap = asprintf(&x2goprint, "%s/../lib/x2go/%s", dirname(buffer), "x2goprint.pl");
+ rvap = asprintf(&x2goprint, "%s/lib/x2go/%s", dirname(dirname(buffer)), "x2goprint.pl");
if(rvap == -1){
fprintf(stderr, "Failed to allocate memory calling asprintf\n");
exit(EXIT_FAILURE);
}
-
// execute the script, running with user-rights of this binary
execv(x2goprint, argv);
diff --git a/x2goserver/x2gosqlitewrapper.c b/x2goserver/x2gosqlitewrapper.c
index 95e2a8a..2b66245 100644
--- a/x2goserver/x2gosqlitewrapper.c
+++ b/x2goserver/x2gosqlitewrapper.c
@@ -27,9 +27,6 @@
#include <libgen.h>
#include <errno.h>
-
-
-
int main( int argc, char *argv[] ) {
char * x2gosqlitewrapper = NULL;
size_t path_max;
@@ -62,7 +59,6 @@ int main( int argc, char *argv[] ) {
exit(EXIT_FAILURE);
}
-
// derive the full path of x2gosqlitewrapper.pl from path of this binary
rvap = asprintf(&x2gosqlitewrapper, "%s/%s", dirname(buffer), "x2gosqlitewrapper.pl");
if(rvap == -1){
@@ -70,7 +66,6 @@ int main( int argc, char *argv[] ) {
exit(EXIT_FAILURE);
}
-
// execute the script, running with user-rights of this binary
execv(x2gosqlitewrapper, argv);
hooks/post-receive
--
x2goserver.git (X2Go Server)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goserver.git" (X2Go Server).
More information about the x2go-commits
mailing list