filecomp.c

Branch :

Show log
Commit
Author : Ran Benita
Date : 2012-05-13 23:31:59
Hash : b89b8e70
Message : Change xkb_map_new_from_fd to use FILE* i.e. xkb_map_new_from_file. The reason is that flex only works with FILE's, so we must use fdopen on the file descriptor; but to avoid a memory leak, we must also fclose() it, which, in turn, closes the file descriptor itself. Either way is not acceptable, so we can either: * dup() the fd and use fdopen on that, or * have the user call fdopen on his own, and accept a FILE* instead of an fd. The second one seems better, and is standard C, so why not. We must add stdio.h to xkbcommon.h though, which is regrettable, but not a big deal. Signed-off-by: Ran Benita <ran234@gmail.com>

test/filecomp.c

/*
Copyright 2009 Dan Nicholson

Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Except as contained in this notice, the names of the authors or their
institutions shall not be used in advertising or otherwise to promote the
sale, use or other dealings in this Software without prior written
authorization from the authors.
*/

#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <limits.h>

#include "xkbcommon/xkbcommon.h"

static int
test_file(const char *path)
{
    FILE *file;
    struct xkb_context *context;
    struct xkb_keymap *keymap;

    file = fopen(path, "r");
    assert(file != NULL);

    context = xkb_context_new(0);
    assert(context);

    fprintf(stderr, "\nCompiling path: %s\n", path);

    keymap = xkb_map_new_from_file(context, file,
                                   XKB_KEYMAP_FORMAT_TEXT_V1, 0);
    fclose(file);

    if (!keymap) {
        fprintf(stderr, "Failed to compile keymap\n");
        xkb_context_unref(context);
        return 0;
    }

    xkb_map_unref(keymap);
    xkb_context_unref(context);
    return 1;
}

static int
test_file_name(const char *file_name)
{
    static char path[PATH_MAX];
    const char *srcdir = getenv("srcdir");

    snprintf(path, PATH_MAX - 1, "%s/test/data/%s", srcdir ? srcdir : ".", file_name);
    return test_file(path);
}

static int
test_string(const char *string)
{
    struct xkb_context *context;
    struct xkb_keymap *keymap;

    context = xkb_context_new(0);
    assert(context);

    fprintf(stderr, "\nCompiling string\n");

    keymap = xkb_map_new_from_string(context, string, XKB_KEYMAP_FORMAT_TEXT_V1, 0);
    if (!keymap) {
        xkb_context_unref(context);
        return 0;
    }

    xkb_map_unref(keymap);
    xkb_context_unref(context);
    return 1;
}

int
main(void)
{

    assert(test_file_name("basic.xkb"));
    /* XXX check we actually get qwertz here ... */
    assert(test_file_name("default.xkb"));
    assert(test_file_name("comprehensive-plus-geom.xkb"));

    assert(!test_file_name("bad.xkb"));

    assert(!test_string(""));

    return 0;
}

kc3-lang/libxkbcommon/test/filecomp.c

Commit

kc3-lang/libxkbcommon /test/filecomp.c