Changeset a9763c6 in mainline

Timestamp:

2014-08-28T12:26:00Z (10 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

794e368

Parents:

2cc1ec0

Message:

Add a very simple font viewer application

Files:

• .bzrignore (modified) (2 diffs)
• boot/Makefile.common (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/app/fontviewer/Makefile (added)
• uspace/app/fontviewer/fontviewer.c (added)
• uspace/app/init/init.c (modified) (1 diff)
• uspace/lib/c/generic/io/asprintf.c (modified) (2 diffs)
• uspace/lib/c/include/stdio.h (modified) (1 diff)
• uspace/lib/posix/include/posix/stdio.h (modified) (1 diff)

.bzrignore

@@ -28 +28 @@
 uspace/app/dnsres/dnsres
 uspace/app/edit/edit
+uspace/app/fontviewer/fontviewer
 uspace/app/getterm/getterm
 uspace/app/inet/inet
@@ -79 +80 @@
 uspace/dist/app/dnsres
 uspace/dist/app/edit
+uspace/dist/app/fontviewer
 uspace/dist/app/getterm
 uspace/dist/app/inet

boot/Makefile.common

@@ -218 +218 @@
         $(USPACE_PATH)/app/vdemo/vdemo \
         $(USPACE_PATH)/app/viewer/viewer \
-        $(USPACE_PATH)/app/df/df
+        $(USPACE_PATH)/app/df/df \
+        $(USPACE_PATH)/app/fontviewer/fontviewer
 
 COMPONENTS = \

uspace/Makefile

@@ -44 +44 @@
         app/download \
         app/edit \
+        app/fontviewer \
         app/getterm \
         app/hdisk \

uspace/app/init/init.c

@@ -356 +356 @@
                 gui_start("/app/vlaunch", HID_COMPOSITOR_SERVER);
                 gui_start("/app/vterm", HID_COMPOSITOR_SERVER);
+                task_spawnl(NULL, NULL, "/app/fontviewer", "/app/fontviewer", "comp:0/winreg", "/cu12.pcf", NULL);
         }
         

uspace/lib/c/generic/io/asprintf.c

@@ -76 +76 @@
  *             the newly allocated string.
  * @fmt        Format string.
+ * @args       Variable argument list
+ *
+ * @return Number of characters printed or a negative error code.
+ *
+ */
+int vasprintf(char **strp, const char *fmt, va_list args)
+{
+        va_list args2;
+        va_copy(args2, args);
+        int ret = vprintf_size(fmt, args2);
+        va_end(args2);
+        
+        if (ret > 0) {
+                *strp = malloc(STR_BOUNDS(ret) + 1);
+                if (*strp == NULL)
+                        return -1;
+                
+                vsnprintf(*strp, STR_BOUNDS(ret) + 1, fmt, args);
+        }
+        
+        return ret;
+}
+
+/** Allocate and print to string.
+ *
+ * @param strp Address of the pointer where to store the address of
+ *             the newly allocated string.
+ * @fmt        Format string.
  *
  * @return Number of characters printed or a negative error code.
@@ -84 +112 @@
         va_list args;
         va_start(args, fmt);
-        int ret = vprintf_size(fmt, args);
+        int ret = vasprintf(strp, fmt, args);
         va_end(args);
-        
-        if (ret > 0) {
-                *strp = malloc(STR_BOUNDS(ret) + 1);
-                if (*strp == NULL)
-                        return -1;
-                
-                va_start(args, fmt);
-                vsnprintf(*strp, STR_BOUNDS(ret) + 1, fmt, args);
-                va_end(args);
-        }
         
         return ret;

uspace/lib/c/include/stdio.h

@@ -120 +120 @@
 extern int snprintf(char *, size_t , const char *, ...)
     PRINTF_ATTRIBUTE(3, 4);
+extern int vasprintf(char **, const char *, va_list);
 extern int asprintf(char **, const char *, ...)
     PRINTF_ATTRIBUTE(2, 3);

uspace/lib/posix/include/posix/stdio.h

@@ -107 +107 @@
 extern int snprintf(char *, size_t , const char *, ...) PRINTF_ATTRIBUTE(3, 4);
 #ifdef _GNU_SOURCE
+extern int vasprintf(char **, const char *, va_list);
 extern int asprintf(char **, const char *, ...) PRINTF_ATTRIBUTE(2, 3);
 #endif