From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.pcdesk.net (mail.pcdesk.net [65.66.213.142]) by hurricane.the-brannons.com (Postfix) with ESMTPS id 5EC292BD41 for ; Mon, 19 Dec 2011 08:16:41 -0600 (CST) Received: from localhost ([50.92.169.105]) (AUTH: LOGIN tspivey@pcdesk.net, SSL: TLSv1/SSLv3,128bits,AES128-SHA) by mail.pcdesk.net with esmtp; Mon, 19 Dec 2011 08:15:18 -0600 id 00000000000941A5.000000004EEF46F6.00002B94 From: Tyler Spivey To: edbrowse-dev@lists.the-brannons.com Date: Mon, 19 Dec 2011 06:15:19 -0800 Message-Id: <1324304120-32208-1-git-send-email-tspivey@pcdesk.net> X-Mailer: git-send-email 1.7.7.4 Subject: [Edbrowse-dev] [PATCH 1/2] Allow opening of existing files containing # X-BeenThere: edbrowse-dev@lists.the-brannons.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Edbrowse Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Dec 2011 14:16:41 -0000 If a filename contains # and already exists, edit it. --- src/buffers.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/buffers.c b/src/buffers.c index a203006..6ba5ada 100644 --- a/src/buffers.c +++ b/src/buffers.c @@ -1119,6 +1119,7 @@ readFile(const char *filename, const char *post) bool rc; /* return code */ bool is8859, isutf8; char *nopound; +char filetype; serverData = 0; serverDataLen = 0; @@ -1195,9 +1196,10 @@ readFile(const char *filename, const char *post) } fromdisk: + filetype = fileTypeByName(filename, false); /* reading a file from disk */ fileSize = 0; - if(fileTypeByName(filename, false) == 'd') { + if(filetype == 'd') { /* directory scan */ int len, j, start, end; cw->baseDirName = cloneString(filename); @@ -1273,7 +1275,7 @@ readFile(const char *filename, const char *post) nopound = cloneString(filename); rbuf = strchr(nopound, '#'); - if(rbuf) + if (rbuf && !filetype) *rbuf = 0; rc = fileIntoMemory(nopound, &rbuf, &fileSize); nzFree(nopound); -- 1.7.7.4