The R Project SVN – R – Diff – /branches/R-syntax/src/gnuwin32/editor.c

 /*
  *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 1999-2020  The R Core Team
+ *  Copyright (C) 1999-2023  The R Core Team
+ *
  *  This program 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; either version 2 of the License, or
  *  (at your option) any later version.
 /* Pointers to currently open editors */
 static editor REditors[MAXNEDITORS];
 static int neditors  = 0;
 static Rboolean fix_editor_up = FALSE;
-static EditorData neweditordata (int file, const char *filename)
+static EditorData neweditordata (int file)
+{
     EditorData p;
     p = (EditorData) malloc(sizeof(struct structEditorData));
     p->file = file;
-    /* need space for terminator, and to copy it */
-    p->filename = (char *) malloc((MAX_PATH+1)*sizeof(char));
-    if (filename)
+    p->filename = NULL;
-	strncpy(p->filename, filename, MAX_PATH+1);
     p->title = (char *) malloc((EDITORMAXTITLE + 1)*sizeof(char));
     p->title[EDITORMAXTITLE] = p->title[0] = '\0';
     return p;
+}
 void deleditordata(EditorData p)
+{
     if (p->stealconsole)
 	fix_editor_up = FALSE;
+    if (p->filename)
-    free(p->filename);
+	free(p->filename);
     free(p->title);
     free(p->hmenu);
     free(p->pmenu);
     free(p);
+}
     settext(c, wtitle);
+}
 /*** FILE MANAGEMENT FUNCTIONS ***/
+/* FIXME: simplify this once UTF-8 is the only supported native encoding. */
+static wchar_t* utf8_to_wchar(const char *src)
+{
+    size_t needed = Rf_utf8towcs(NULL, src, 0);
+    wchar_t *res = (wchar_t  *)malloc((needed + 1)*sizeof(wchar_t));
+    if (res)
+	Rf_utf8towcs(res, src, needed + 1);
+    return res;
+}
+static char* utf8_to_native(const char *src)
+{
+    /* a defensive guess, reEnc2 would throw error if not enough */
+    size_t needed = strlen(src) * 4;
+    char *res = (char *)malloc(needed + 1);
+    if (res)
+	reEnc2(src, res, needed + 1, CE_UTF8, CE_NATIVE, 3);
+    return res;
+}
+static char* native_to_utf8(const char *src)
+{
+    /* a defensive guess, reEnc2 would throw error if not enough */
+    size_t needed = strlen(src) * 4;
+    char *res = (char *)malloc(needed + 1);
+    if (res)
+	reEnc2(src, res, needed + 1, CE_NATIVE, CE_UTF8, 3);
+    return res;
+}
+static char* wchar_to_utf8(const wchar_t *src)
+{
+    size_t needed = Rf_wcstoutf8(NULL, src, INT_MAX);
+    char *res = (char *)malloc(needed + 1);
+    if (res)
+	Rf_wcstoutf8(res, src, needed + 1);
+    return res;
+}
 FILE *R_wfopen(const wchar_t *filename, const wchar_t *mode);
+#define MSGSIZE 512
 static void editor_load_file(editor c, const char *name, int enc)
+{
     textbox t = getdata(c);
     EditorData p = getdata(t);
     FILE *f;
-    char *buffer = NULL, tmp[MAX_PATH+50], tname[MAX_PATH+1];
+    char *buffer = NULL, tmp[MSGSIZE];
     const char *sname;
     long num = 1, bufsize;
     if(enc == CE_UTF8) {
-	wchar_t wname[MAX_PATH+1];
+	wchar_t *wname = utf8_to_wchar(name);
-	Rf_utf8towcs(wname, name, MAX_PATH+1);
 	f = R_wfopen(wname, L"r");
-	reEnc2(name, tname, MAX_PATH+1, CE_UTF8, CE_NATIVE, 3);
+	free(wname);
-	sname = tname;
+	sname = utf8_to_native(name);
     } else {
 	f = R_fopen(name, "r");
 	sname = name;
+    }
     if (f == NULL) {
-	snprintf(tmp, MAX_PATH+50,
+	snprintf(tmp, MSGSIZE,
 		 G_("unable to open file %s for reading"), sname);
 	R_ShowMessage(tmp);
+	if (enc == CE_UTF8)
+	    free((char *)sname);
 	return;
+    }
     p->file = 1;
+    if (p->filename)
+	free(p->filename);
+    if (enc == CE_UTF8) {
+	p->filename = (char *) malloc(strlen(name) + 1);
-    strncpy(p->filename, name, MAX_PATH+1);
+	strcpy(p->filename, name);
+    } else
+	p->filename = native_to_utf8(name);
     bufsize = 0;
     while (num > 0) {
 	buffer = realloc(buffer, bufsize + 3000 + 1);
 	num = fread(buffer + bufsize, 1, 3000 - 1, f);
 	if (num >= 0) {
 	    bufsize += num;
 	    buffer[bufsize] = '\0';
+	}
 	else {
-	    snprintf(tmp, MAX_PATH+50,
+	    snprintf(tmp, MSGSIZE,
 		     G_("Could not read from file '%s'"), sname);
 	    askok(tmp);
+	}
+    }
     setlimittext(t, 2 * strlen(buffer));
     settext(t, buffer);
     gsetmodified(t, 0);
     free(buffer);
     fclose(f);
+    if (enc == CE_UTF8)
+	free((char *)sname);
+}
 static void editor_save_file(editor c, const char *name, int enc)
+{
     textbox t = getdata(c);
     FILE *f;
-    char buf[MAX_PATH+30], tname[MAX_PATH+1];
+    char buf[MSGSIZE];
     const char *sname;
     if (name == NULL)
 	return;
     else {
 	if(enc == CE_UTF8) {
-	    wchar_t wname[MAX_PATH+1];
+	    wchar_t *wname = utf8_to_wchar(name);
-	    Rf_utf8towcs(wname, name, MAX_PATH+1);
-	    reEnc2(name, tname, MAX_PATH+1, CE_UTF8, CE_NATIVE, 3);
-	    sname = tname;
 	    f = R_wfopen(wname, L"w");
+	    free(wname);
+	    sname = utf8_to_native(name);
 	} else {
 	    sname = name;
 	    f = R_fopen(sname, "w");
+	}
 	if (f == NULL) {
-	    snprintf(buf, MAX_PATH+30, G_("Could not save file '%s'"), sname);
+	    snprintf(buf, MSGSIZE, G_("Could not save file '%s'"), sname);
 	    askok(buf);
+	    if (enc == CE_UTF8)
+		free((char *)sname);
 	    return;
+	}
 	fprintf(f, "%s", gettext(t));
 	fclose(f);
+	if (enc == CE_UTF8)
+	    free((char *)sname);
+    }
+}
 static void editorsaveas(editor c)
+{
     wchar_t *wname;
     setuserfilterW(L"R files (*.R)\0*.R\0S files (*.q, *.ssc, *.S)\0*.q;*.ssc;*.S\0All files (*.*)\0*.*\0\0");
     wname = askfilesaveW(G_("Save script as"), "");
     if (wname) {
-	char name[4*MAX_PATH+1];
-	wcstoutf8(name, wname, sizeof(name));
+	char *name = wchar_to_utf8(wname);
-	/* now check if it has an extension */
 	char *q = strchr(name, '.');
+	if(!q) {
+	    char *tmp = (char *)malloc(strlen(name) + 2 + 1);
+	    if (tmp) {
+		strcpy(tmp, name);
-	if(!q) strncat(name, ".R", 4*MAX_PATH);
+		strcat(tmp, ".R");
+		free(name);
+		name = tmp;
+	    }
+	}
 	editor_save_file(c, name, CE_UTF8);
 	p->file = 1;
-	reEnc2(name, p->filename, MAX_PATH+1, CE_UTF8, CE_NATIVE, 3);
+	p->filename = name; /* keeps name */
 	gsetmodified(t, 0);
+	char *sname = utf8_to_native(name);
-	editor_set_title(c, p->filename);
+	editor_set_title(c, sname);
+	free(sname);
+    }
     show(c);
+}
 static void menueditorsaveas(control m)
+}
 static void editoropen(const char *default_name)
+{
     wchar_t *wname;
-    char name[4*MAX_PATH + 1], title[4*MAX_PATH];
     int i; textbox t; EditorData p;
     setuserfilterW(L"R files (*.R)\0*.R\0S files (*.q, *.ssc, *.S)\0*.q;*.ssc;*.S\0All files (*.*)\0*.*\0\0");
     wname = askfilenameW(G_("Open script"), default_name); /* returns NULL if open dialog cancelled */
     if (wname) {
-	wcstoutf8(name, wname, sizeof(name));
+	char *name = wchar_to_utf8(wname);
 	/* check if file is already open in an editor. If so, close and open again */
 	for (i = 0; i < neditors; ++i) {
 	    t = getdata(REditors[i]);
 	    p = getdata(t);
-	    if (!strcmp (name, p->filename)) {
+	    if (p->filename && !strcmp (name, p->filename)) {
 		editorclose(REditors[i]);
 		break;
+	    }
+	}
-	reEnc2(name, title, MAX_PATH+1, CE_UTF8, CE_NATIVE, 3);
+	char *sname = utf8_to_native(name);
-	Rgui_Edit(name, CE_UTF8, title, 0);
+	Rgui_Edit(name, CE_UTF8, sname, 0);
+	free(name);
+	free(sname);
     } else show(RConsole);
+}
 void menueditoropen(control m)
+{
     editor c = getdata(m);
-    char *default_name = "";
     /* It really is not clear what is meant here: seems to assume an
        editor window but is called from elsewhere, hopefully with NULL
        (since 2.1.1 patched). */
     if (c) {
 	textbox t = getdata(c);
 	EditorData p = getdata(t);
+	if (p->file && p->filename) {
-	if (p->file) default_name = p->filename;  /* name of currently-open file, if there is one */
+	    /* name of currently-open file, if there is one */
+	    char *sname = utf8_to_native(p->filename);
+	    editoropen(sname);
+	    free(sname);
+	    return;
+	}
     }
-    editoropen(default_name);
+    editoropen("");
+}
 /*** EDITING FUNCTIONS ***/
 /*** FUNCTIONS FOR RUNNING R CODE FROM THE EDITOR ***/
 static void editorrunline(textbox t)
+{
     int length = getlinelength(t); /* return character num */
-    char *line = malloc(length * sizeof(WCHAR) + 2); /* Extra space for null and word length in getcurrentline */
+    /* Extra space for null and word length in getcurrentline */
+    size_t alength = length * MB_CUR_MAX + 1 + sizeof(WORD);
+    char *line = malloc(alength);
-    memset(line, 0, length * sizeof(WCHAR) + 2);
+    memset(line, 0, alength);
     getcurrentline(t, line, length);
     consolecmd(RConsole, line);
     free(line);
     scrollcaret(t, 1);
     show(t);
     editor c;
     menuitem m;
     textbox t;
     long flags;
     font editorfn = (consolefn ? consolefn : FixedFont);
-    EditorData p = neweditordata(0, NULL);
+    EditorData p = neweditordata(0);
     DWORD rand;
     w = (pagercol + 1)*fontwidth(editorfn);
     h = (pagerrow + 1)*fontheight(editorfn) + 1;
 #ifdef USE_MDI

The R Project SVN R

(root)/branches/R-syntax/src/gnuwin32/editor.c – Rev 79226 → 83796