Changeset 5604

Timestamp:

06/11/08 12:15:40 (4 months ago)

Author:

morris

Message:

Consult env variables LINES and COLUMNS if TIOCGWINSZ fails

Files:

• libwired/trunk/libwired/system/wi-system.c (modified) (3 diffs)
• libwired/trunk/libwired/system/wi-system.h (modified) (1 diff)
• libwired/trunk/libwired/system/wi-terminal.c (modified) (2 diffs)

libwired/trunk/libwired/system/wi-system.c

@@ -160 +160 @@
-
-wi_string_t * wi_user_name(void) {
-char                   *env
+wi_string_t            *user
-        struct passwd   *pwd;
-        
-env = getenv("USER"
-
-env
-wi_string_with_cstring(env)
+user = wi_getenv(WI_STR("USER")
+
+user
+user
-        
-        pwd = getpwuid(getuid());
@@ -179 +179 @@
-
-wi_string_t * wi_user_home(void) {
-char                   *env
+wi_string_t            *home
-        struct passwd   *pwd;
-        
-env = getenv("HOME"
-
-env
-wi_string_with_cstring(env)
+home = wi_getenv(WI_STR("HOME")
+
+home
+home
-        
-        pwd = getpwuid(getuid());
@@ -258 +258 @@
-#pragma mark -
-
+wi_string_t * wi_getenv(wi_string_t *name) {
+        char                    *value;
+        
+        value = getenv(wi_string_cstring(name));
+        
+        if(!value)
+                return NULL;
+        
+        return wi_string_with_cstring(value);
+}
+
+
+
+#pragma mark -
+
-void wi_getopt_reset(void) {
-#ifdef __GLIBC__

libwired/trunk/libwired/system/wi-system.h

@@ -50 +50 @@
-WI_EXPORT void                                  wi_free(void *);
-
+WI_EXPORT wi_string_t *                 wi_getenv(wi_string_t *);
+
-WI_EXPORT void                                  wi_getopt_reset(void);
-

libwired/trunk/libwired/system/wi-terminal.c

@@ -61 +61 @@
-#include <wired/wi-runtime.h>
-#include <wired/wi-string.h>
+#include <wired/wi-system.h>
-#include <wired/wi-terminal.h>
-
@@ -375 +376 @@
-
-wi_size_t wi_terminal_lookup_size(wi_terminal_t *terminal) {
+        wi_string_t                     *width, *height;
-        struct winsize          win;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-}
-