summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--common/arch.h2
-rw-r--r--common/defines.h2
-rw-r--r--common/file.c2
-rw-r--r--common/file.h2
-rw-r--r--common/file_loc.h2
-rw-r--r--common/list.c2
-rw-r--r--common/list.h2
-rw-r--r--common/log.c2
-rw-r--r--common/log.h2
-rw-r--r--common/os_calls.c29
-rw-r--r--common/os_calls.h6
-rw-r--r--common/parse.h7
-rw-r--r--common/ssl_calls.c2
-rw-r--r--common/ssl_calls.h2
-rw-r--r--common/thread_calls.c2
-rw-r--r--common/thread_calls.h2
16 files changed, 51 insertions, 17 deletions
diff --git a/common/arch.h b/common/arch.h
index 2b5d6bc0..a56e0b52 100644
--- a/common/arch.h
+++ b/common/arch.h
@@ -14,7 +14,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
xrdp: A Remote Desktop Protocol server.
- Copyright (C) Jay Sorg 2004-2005
+ Copyright (C) Jay Sorg 2004-2006
*/
diff --git a/common/defines.h b/common/defines.h
index 657f9e20..9b5add70 100644
--- a/common/defines.h
+++ b/common/defines.h
@@ -14,7 +14,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
xrdp: A Remote Desktop Protocol server.
- Copyright (C) Jay Sorg 2004-2005
+ Copyright (C) Jay Sorg 2004-2006
main define/macro file
diff --git a/common/file.c b/common/file.c
index fc7e74d9..0df36840 100644
--- a/common/file.c
+++ b/common/file.c
@@ -14,7 +14,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
xrdp: A Remote Desktop Protocol server.
- Copyright (C) Jay Sorg 2004-2005
+ Copyright (C) Jay Sorg 2004-2006
read a config file
diff --git a/common/file.h b/common/file.h
index 6e4c7736..664ff073 100644
--- a/common/file.h
+++ b/common/file.h
@@ -14,7 +14,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
xrdp: A Remote Desktop Protocol server.
- Copyright (C) Jay Sorg 2004-2005
+ Copyright (C) Jay Sorg 2004-2006
*/
diff --git a/common/file_loc.h b/common/file_loc.h
index 0ff4087d..790521f8 100644
--- a/common/file_loc.h
+++ b/common/file_loc.h
@@ -14,7 +14,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
xrdp: A Remote Desktop Protocol server.
- Copyright (C) Jay Sorg 2004-2005
+ Copyright (C) Jay Sorg 2004-2006
default file locations for log, config, etc
diff --git a/common/list.c b/common/list.c
index e6e4f8d5..96b96eb7 100644
--- a/common/list.c
+++ b/common/list.c
@@ -14,7 +14,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
xrdp: A Remote Desktop Protocol server.
- Copyright (C) Jay Sorg 2004-2005
+ Copyright (C) Jay Sorg 2004-2006
simple list
diff --git a/common/list.h b/common/list.h
index 68a52b48..a1163515 100644
--- a/common/list.h
+++ b/common/list.h
@@ -14,7 +14,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
xrdp: A Remote Desktop Protocol server.
- Copyright (C) Jay Sorg 2004-2005
+ Copyright (C) Jay Sorg 2004-2006
*/
diff --git a/common/log.c b/common/log.c
index ef4d6676..14d438ab 100644
--- a/common/log.c
+++ b/common/log.c
@@ -14,7 +14,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
xrdp: A Remote Desktop Protocol server.
- Copyright (C) Jay Sorg 2005
+ Copyright (C) Jay Sorg 2005-2006
session manager
linux only
diff --git a/common/log.h b/common/log.h
index f6ea8a46..5735583b 100644
--- a/common/log.h
+++ b/common/log.h
@@ -14,7 +14,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
xrdp: A Remote Desktop Protocol server.
- Copyright (C) Jay Sorg 2005
+ Copyright (C) Jay Sorg 2005-2006
session manager
linux only
diff --git a/common/os_calls.c b/common/os_calls.c
index 5895449d..75dfaa2d 100644
--- a/common/os_calls.c
+++ b/common/os_calls.c
@@ -14,7 +14,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
xrdp: A Remote Desktop Protocol server.
- Copyright (C) Jay Sorg 2004-2005
+ Copyright (C) Jay Sorg 2004-2006
generic operating system calls
@@ -103,6 +103,33 @@ g_sprintf(char* dest, char* format, ...)
}
/*****************************************************************************/
+void
+g_writeln(char* format, ...)
+{
+ va_list ap;
+
+ va_start(ap, format);
+ vfprintf(stdout, format, ap);
+ va_end(ap);
+#if defined(_WIN32)
+ g_printf("\r\n");
+#else
+ g_printf("\n");
+#endif
+}
+
+/*****************************************************************************/
+void
+g_write(char* format, ...)
+{
+ va_list ap;
+
+ va_start(ap, format);
+ vfprintf(stdout, format, ap);
+ va_end(ap);
+}
+
+/*****************************************************************************/
/* produce a hex dump */
void
g_hexdump(char* p, int len)
diff --git a/common/os_calls.h b/common/os_calls.h
index 2a3819c9..62607428 100644
--- a/common/os_calls.h
+++ b/common/os_calls.h
@@ -14,7 +14,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
xrdp: A Remote Desktop Protocol server.
- Copyright (C) Jay Sorg 2004-2005
+ Copyright (C) Jay Sorg 2004-2006
generic operating system calls
@@ -32,6 +32,10 @@ g_printf(char *format, ...);
void
g_sprintf(char* dest, char* format, ...);
void
+g_writeln(char* format, ...);
+void
+g_write(char* format, ...);
+void
g_hexdump(char* p, int len);
void
g_memset(void* ptr, int val, int size);
diff --git a/common/parse.h b/common/parse.h
index 288ae91a..26c259cb 100644
--- a/common/parse.h
+++ b/common/parse.h
@@ -18,8 +18,11 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* modified for xrdp */
-/* this is a super fast stream method, you bet */
+/* modified for xrdp
+ this is a super fast stream method, you bet
+
+ needed functions g_malloc, g_free, g_memset, g_memcpy
+*/
#if !defined(PARSE_H)
#define PARSE_H
diff --git a/common/ssl_calls.c b/common/ssl_calls.c
index 2ab60f0c..ba77b8db 100644
--- a/common/ssl_calls.c
+++ b/common/ssl_calls.c
@@ -14,7 +14,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
xrdp: A Remote Desktop Protocol server.
- Copyright (C) Jay Sorg 2004-2005
+ Copyright (C) Jay Sorg 2004-2006
ssl calls
diff --git a/common/ssl_calls.h b/common/ssl_calls.h
index ca098740..d4e26e2c 100644
--- a/common/ssl_calls.h
+++ b/common/ssl_calls.h
@@ -14,7 +14,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
xrdp: A Remote Desktop Protocol server.
- Copyright (C) Jay Sorg 2004-2005
+ Copyright (C) Jay Sorg 2004-2006
*/
diff --git a/common/thread_calls.c b/common/thread_calls.c
index 84407669..578bc0b9 100644
--- a/common/thread_calls.c
+++ b/common/thread_calls.c
@@ -14,7 +14,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
xrdp: A Remote Desktop Protocol server.
- Copyright (C) Jay Sorg 2004-2005
+ Copyright (C) Jay Sorg 2004-2006
thread calls
diff --git a/common/thread_calls.h b/common/thread_calls.h
index af94bafe..8702c7e2 100644
--- a/common/thread_calls.h
+++ b/common/thread_calls.h
@@ -14,7 +14,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
xrdp: A Remote Desktop Protocol server.
- Copyright (C) Jay Sorg 2004-2005
+ Copyright (C) Jay Sorg 2004-2006
*/