Replace default posix file handling table with GEMDOS compatible one
Since build #1917, URL to path conversion was broken. Thanks to Peter for reporting the bug. Most of the path handling code was taken from the windows frontend. Note: - NetSurf core switched to an file handling table with default posix compatible functions. - The atari frontend always uses GEMDOS compatible path like: "u:\folder\1", even when running on top of FreeMiNT environment.
This commit is contained in:
Ole Loots
parent
a9ac9c00fc
commit
d7f479070e
|
|
@ -84,6 +84,7 @@ S_ATARI := \
|
|||
deskmenu.c \
|
||||
download.c \
|
||||
encoding.c \
|
||||
file.c \
|
||||
findfile.c \
|
||||
filetype.c \
|
||||
font.c \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,293 @@
|
|||
/*
|
||||
* Copyright 2014 Ole Loots <ole@monochrom.net>
|
||||
*
|
||||
* This file is part of NetSurf, http://www.netsurf-browser.org/
|
||||
*
|
||||
* NetSurf is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; version 2 of the License.
|
||||
*
|
||||
* NetSurf is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "desktop/gui_factory.h"
|
||||
|
||||
#include "utils/utils.h"
|
||||
#include "utils/corestrings.h"
|
||||
#include "utils/url.h"
|
||||
#include "utils/nsurl.h"
|
||||
#include "utils/file.h"
|
||||
|
||||
/**
|
||||
* Atari file handling callbacks.
|
||||
* Most of this code was taken from windows/gui.c
|
||||
*/
|
||||
|
||||
/**
|
||||
* Generate a GEMDOS path from one or more component elemnts.
|
||||
*
|
||||
* If a string is allocated it must be freed by the caller.
|
||||
*
|
||||
* @param[in,out] str pointer to string pointer if this is NULL enough
|
||||
* storage will be allocated for the complete path.
|
||||
* @param[in,out] size The size of the space available if \a str not
|
||||
* NULL on input and if not NULL set to the total
|
||||
* output length on output.
|
||||
* @param[in] nemb The number of elements.
|
||||
* @param[in] ... The elements of the path as string pointers.
|
||||
* @return NSERROR_OK and the complete path is written to str
|
||||
* or error code on faliure.
|
||||
*/
|
||||
static nserror atari_mkpath(char **str, size_t *size, size_t nelm, va_list ap)
|
||||
{
|
||||
return vsnstrjoin(str, size, '\\', nelm, ap);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the basename of a file using GEMDOS path handling.
|
||||
*
|
||||
* This gets the last element of a path and returns it.
|
||||
*
|
||||
* @param[in] path The path to extract the name from.
|
||||
* @param[in,out] str Pointer to string pointer if this is NULL enough
|
||||
* storage will be allocated for the path element.
|
||||
* @param[in,out] size The size of the space available if \a
|
||||
* str not NULL on input and set to the total
|
||||
* output length on output.
|
||||
* @return NSERROR_OK and the complete path is written to str
|
||||
* or error code on faliure.
|
||||
*/
|
||||
static nserror atari_basename(const char *path, char **str, size_t *size)
|
||||
{
|
||||
const char *leafname;
|
||||
char *fname;
|
||||
|
||||
if (path == NULL) {
|
||||
return NSERROR_BAD_PARAMETER;
|
||||
}
|
||||
|
||||
leafname = strrchr(path, '\\');
|
||||
if (!leafname) {
|
||||
leafname = path;
|
||||
} else {
|
||||
leafname += 1;
|
||||
}
|
||||
|
||||
fname = strdup(leafname);
|
||||
if (fname == NULL) {
|
||||
return NSERROR_NOMEM;
|
||||
}
|
||||
|
||||
*str = fname;
|
||||
if (size != NULL) {
|
||||
*size = strlen(fname);
|
||||
}
|
||||
return NSERROR_OK;
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a path from a nsurl using GEMDOS file handling.
|
||||
*
|
||||
* @parm[in] url The url to encode.
|
||||
* @param[out] path_out A string containing the result path which should
|
||||
* be freed by the caller.
|
||||
* @return NSERROR_OK and the path is written to \a path or error code
|
||||
* on faliure.
|
||||
*/
|
||||
static nserror atari_nsurl_to_path(struct nsurl *url, char **path_out)
|
||||
{
|
||||
lwc_string *urlpath;
|
||||
char *path;
|
||||
bool match;
|
||||
lwc_string *scheme;
|
||||
nserror res;
|
||||
|
||||
if ((url == NULL) || (path_out == NULL)) {
|
||||
return NSERROR_BAD_PARAMETER;
|
||||
}
|
||||
|
||||
scheme = nsurl_get_component(url, NSURL_SCHEME);
|
||||
|
||||
if (lwc_string_caseless_isequal(scheme, corestring_lwc_file,
|
||||
&match) != lwc_error_ok)
|
||||
{
|
||||
return NSERROR_BAD_PARAMETER;
|
||||
}
|
||||
lwc_string_unref(scheme);
|
||||
if (match == false) {
|
||||
return NSERROR_BAD_PARAMETER;
|
||||
}
|
||||
|
||||
urlpath = nsurl_get_component(url, NSURL_PATH);
|
||||
if (urlpath == NULL) {
|
||||
return NSERROR_BAD_PARAMETER;
|
||||
}
|
||||
|
||||
res = url_unescape(lwc_string_data(urlpath), &path);
|
||||
lwc_string_unref(urlpath);
|
||||
if (res != NSERROR_OK) {
|
||||
return res;
|
||||
}
|
||||
|
||||
/* if there is a drive: prefix treat path as DOS filename */
|
||||
if ((path[2] == ':') || (path[2] == '|')) {
|
||||
|
||||
/* move the string down to remove leading / note the
|
||||
* strlen is *not* copying too much data as we are
|
||||
* moving the null too!
|
||||
*/
|
||||
memmove(path, path + 1, strlen(path));
|
||||
}
|
||||
/* if the path does not have a drive letter we return the
|
||||
* complete path.
|
||||
*/
|
||||
/** @todo Need to check returning the unaltered path in this
|
||||
* case is correct
|
||||
*/
|
||||
|
||||
*path_out = path;
|
||||
|
||||
return NSERROR_OK;
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a nsurl from a path using GEMDOS file handling.
|
||||
*
|
||||
* Perform the necessary operations on a path to generate a nsurl.
|
||||
*
|
||||
* @param[in] path The path to convert.
|
||||
* @param[out] url_out pointer to recive the nsurl, The returned url
|
||||
* should be unreferenced by the caller.
|
||||
* @return NSERROR_OK and the url is placed in \a url or error code on
|
||||
* faliure.
|
||||
*/
|
||||
static nserror atari_path_to_nsurl(const char *path, struct nsurl **url_out)
|
||||
{
|
||||
nserror ret;
|
||||
int urllen;
|
||||
char *urlstr;
|
||||
char *escpath; /* escaped version of the path */
|
||||
char *escpaths;
|
||||
|
||||
if ((path == NULL) || (url_out == NULL) || (*path == 0)) {
|
||||
return NSERROR_BAD_PARAMETER;
|
||||
}
|
||||
|
||||
/* escape the path so it can be placed in a url */
|
||||
ret = url_escape(path, 0, false, "/", &escpath);
|
||||
if (ret != NSERROR_OK) {
|
||||
return ret;
|
||||
}
|
||||
/* remove unecessary / as file: paths are already absolute */
|
||||
escpaths = escpath;
|
||||
while (*escpaths == '/') {
|
||||
escpaths++;
|
||||
}
|
||||
|
||||
/* build url as a string for nsurl constructor */
|
||||
urllen = strlen(escpaths) + FILE_SCHEME_PREFIX_LEN + 1;
|
||||
urlstr = malloc(urllen);
|
||||
if (urlstr == NULL) {
|
||||
free(escpath);
|
||||
return NSERROR_NOMEM;
|
||||
}
|
||||
|
||||
snprintf(urlstr, urllen, "%s%s", FILE_SCHEME_PREFIX, escpaths);
|
||||
free(escpath);
|
||||
|
||||
ret = nsurl_create(urlstr, url_out);
|
||||
free(urlstr);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* Ensure that all directory elements needed to store a filename exist.
|
||||
*
|
||||
* @param fname The filename to ensure the path to exists.
|
||||
* @return NSERROR_OK on success or error code on failure.
|
||||
*/
|
||||
static nserror atari_mkdir_all(const char *fname)
|
||||
{
|
||||
char *dname;
|
||||
char *sep;
|
||||
struct stat sb;
|
||||
|
||||
dname = strdup(fname);
|
||||
|
||||
sep = strrchr(dname, '/');
|
||||
if (sep == NULL) {
|
||||
/* no directory separator path is just filename so its ok */
|
||||
free(dname);
|
||||
return NSERROR_OK;
|
||||
}
|
||||
|
||||
*sep = 0; /* null terminate directory path */
|
||||
|
||||
if (stat(dname, &sb) == 0) {
|
||||
free(dname);
|
||||
if (S_ISDIR(sb.st_mode)) {
|
||||
/* path to file exists and is a directory */
|
||||
return NSERROR_OK;
|
||||
}
|
||||
return NSERROR_NOT_DIRECTORY;
|
||||
}
|
||||
*sep = '/'; /* restore separator */
|
||||
|
||||
sep = dname;
|
||||
while (*sep == '/') {
|
||||
sep++;
|
||||
}
|
||||
while ((sep = strchr(sep, '/')) != NULL) {
|
||||
*sep = 0;
|
||||
if (stat(dname, &sb) != 0) {
|
||||
if (nsmkdir(dname, S_IRWXU) != 0) {
|
||||
/* could not create path element */
|
||||
free(dname);
|
||||
return NSERROR_NOT_FOUND;
|
||||
}
|
||||
} else {
|
||||
if (! S_ISDIR(sb.st_mode)) {
|
||||
/* path element not a directory */
|
||||
free(dname);
|
||||
return NSERROR_NOT_DIRECTORY;
|
||||
}
|
||||
}
|
||||
*sep = '/'; /* restore separator */
|
||||
/* skip directory separators */
|
||||
while (*sep == '/') {
|
||||
sep++;
|
||||
}
|
||||
}
|
||||
|
||||
free(dname);
|
||||
return NSERROR_OK;
|
||||
}
|
||||
|
||||
|
||||
/* atari file handling table */
|
||||
static struct gui_file_table file_table = {
|
||||
.mkpath = atari_mkpath,
|
||||
.basename = atari_basename,
|
||||
.nsurl_to_path = atari_nsurl_to_path,
|
||||
.path_to_nsurl = atari_path_to_nsurl,
|
||||
.mkdir_all = atari_mkdir_all,
|
||||
};
|
||||
|
||||
struct gui_file_table *atari_file_table = &file_table;
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
/*
|
||||
* Copyright 2014 Ole Loots <ole@monochrom.net>
|
||||
*
|
||||
* This file is part of NetSurf, http://www.netsurf-browser.org/
|
||||
*
|
||||
* NetSurf is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; version 2 of the License.
|
||||
*
|
||||
* NetSurf is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef FILE_C_INCLUDED
|
||||
#define FILE_C_INCLUDED
|
||||
|
||||
#include "utils/file.h"
|
||||
|
||||
struct gui_file_table *atari_file_table;
|
||||
|
||||
|
||||
#endif // FILE_C_INCLUDED
|
||||
|
|
@ -70,6 +70,7 @@
|
|||
#include "atari/search.h"
|
||||
#include "atari/deskmenu.h"
|
||||
#include "atari/download.h"
|
||||
#include "atari/file.h"
|
||||
#include "atari/filetype.h"
|
||||
#include "cflib.h"
|
||||
|
||||
|
|
@ -133,7 +134,7 @@ static void gui_poll(bool active)
|
|||
if(input_window && input_window->root->redraw_slots.areas_used > 0) {
|
||||
window_process_redraws(input_window->root);
|
||||
}
|
||||
|
||||
|
||||
|
||||
graf_mkstate(&mx, &my, &dummy, &dummy);
|
||||
aes_event_in.emi_m1.g_x = mx;
|
||||
|
|
@ -1064,6 +1065,7 @@ int main(int argc, char** argv)
|
|||
.clipboard = &atari_clipboard_table,
|
||||
.download = atari_download_table,
|
||||
.fetch = &atari_fetch_table,
|
||||
.file = atari_file_table,
|
||||
.utf8 = atari_utf8_table,
|
||||
.search = atari_search_table,
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue