Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset a9763c6 in mainline


Ignore:
Timestamp:
2014-08-28T12:26:00Z (7 years ago)
Author:
Martin Sucha <sucha14@…>
Branches:
lfn, master
Children:
794e368
Parents:
2cc1ec0
Message:

Add a very simple font viewer application

Files:
2 added
7 edited

Legend:

Unmodified
Added
Removed
  • .bzrignore

    r2cc1ec0 ra9763c6  
    2828uspace/app/dnsres/dnsres
    2929uspace/app/edit/edit
     30uspace/app/fontviewer/fontviewer
    3031uspace/app/getterm/getterm
    3132uspace/app/inet/inet
     
    7980uspace/dist/app/dnsres
    8081uspace/dist/app/edit
     82uspace/dist/app/fontviewer
    8183uspace/dist/app/getterm
    8284uspace/dist/app/inet
  • boot/Makefile.common

    r2cc1ec0 ra9763c6  
    218218        $(USPACE_PATH)/app/vdemo/vdemo \
    219219        $(USPACE_PATH)/app/viewer/viewer \
    220         $(USPACE_PATH)/app/df/df
     220        $(USPACE_PATH)/app/df/df \
     221        $(USPACE_PATH)/app/fontviewer/fontviewer
    221222
    222223COMPONENTS = \
  • uspace/Makefile

    r2cc1ec0 ra9763c6  
    4444        app/download \
    4545        app/edit \
     46        app/fontviewer \
    4647        app/getterm \
    4748        app/hdisk \
  • uspace/app/init/init.c

    r2cc1ec0 ra9763c6  
    356356                gui_start("/app/vlaunch", HID_COMPOSITOR_SERVER);
    357357                gui_start("/app/vterm", HID_COMPOSITOR_SERVER);
     358                task_spawnl(NULL, NULL, "/app/fontviewer", "/app/fontviewer", "comp:0/winreg", "/cu12.pcf", NULL);
    358359        }
    359360       
  • uspace/lib/c/generic/io/asprintf.c

    r2cc1ec0 ra9763c6  
    7676 *             the newly allocated string.
    7777 * @fmt        Format string.
     78 * @args       Variable argument list
     79 *
     80 * @return Number of characters printed or a negative error code.
     81 *
     82 */
     83int vasprintf(char **strp, const char *fmt, va_list args)
     84{
     85        va_list args2;
     86        va_copy(args2, args);
     87        int ret = vprintf_size(fmt, args2);
     88        va_end(args2);
     89       
     90        if (ret > 0) {
     91                *strp = malloc(STR_BOUNDS(ret) + 1);
     92                if (*strp == NULL)
     93                        return -1;
     94               
     95                vsnprintf(*strp, STR_BOUNDS(ret) + 1, fmt, args);
     96        }
     97       
     98        return ret;
     99}
     100
     101/** Allocate and print to string.
     102 *
     103 * @param strp Address of the pointer where to store the address of
     104 *             the newly allocated string.
     105 * @fmt        Format string.
    78106 *
    79107 * @return Number of characters printed or a negative error code.
     
    84112        va_list args;
    85113        va_start(args, fmt);
    86         int ret = vprintf_size(fmt, args);
     114        int ret = vasprintf(strp, fmt, args);
    87115        va_end(args);
    88        
    89         if (ret > 0) {
    90                 *strp = malloc(STR_BOUNDS(ret) + 1);
    91                 if (*strp == NULL)
    92                         return -1;
    93                
    94                 va_start(args, fmt);
    95                 vsnprintf(*strp, STR_BOUNDS(ret) + 1, fmt, args);
    96                 va_end(args);
    97         }
    98116       
    99117        return ret;
  • uspace/lib/c/include/stdio.h

    r2cc1ec0 ra9763c6  
    120120extern int snprintf(char *, size_t , const char *, ...)
    121121    PRINTF_ATTRIBUTE(3, 4);
     122extern int vasprintf(char **, const char *, va_list);
    122123extern int asprintf(char **, const char *, ...)
    123124    PRINTF_ATTRIBUTE(2, 3);
  • uspace/lib/posix/include/posix/stdio.h

    r2cc1ec0 ra9763c6  
    107107extern int snprintf(char *, size_t , const char *, ...) PRINTF_ATTRIBUTE(3, 4);
    108108#ifdef _GNU_SOURCE
     109extern int vasprintf(char **, const char *, va_list);
    109110extern int asprintf(char **, const char *, ...) PRINTF_ATTRIBUTE(2, 3);
    110111#endif
Note: See TracChangeset for help on using the changeset viewer.