[5065] in arla-drinkers
Bug found in Arla CVS
daemon@ATHENA.MIT.EDU (Bo Branten)
Fri Jan 22 11:24:42 2016
From arla-drinkers-bounces@stacken.kth.se Fri Jan 22 16:24:42 2016
Return-Path: <arla-drinkers-bounces@stacken.kth.se>
Delivered-To: arla-drinkers-mtg@bloom-picayune.mit.edu
Received: (qmail 25335 invoked from network); 22 Jan 2016 16:24:42 -0000
Received: from mx6.kth.se (130.237.48.70)
by charon.mit.edu with SMTP; 22 Jan 2016 16:24:42 -0000
Received: from mx6.kth.se (localhost [127.0.0.1])
by mx6.kth.se (Postfix) with ESMTP id 5706D1C013D;
Fri, 22 Jan 2016 17:24:41 +0100 (CET)
X-Virus-Scanned: by amavisd-new at kth.se
Received: from mx6.kth.se ([127.0.0.1])
by mx6.kth.se (mx6.kth.se [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id kLtDc6cvZ4mF; Fri, 22 Jan 2016 17:24:27 +0100 (CET)
Received: from vingummi.stacken.kth.se (lists.stacken.kth.se [130.237.234.174])
by mx6.kth.se (Postfix) with ESMTP;
Fri, 22 Jan 2016 17:24:26 +0100 (CET)
Received: from vingummi.stacken.kth.se (localhost [IPv6:::1])
by vingummi.stacken.kth.se (Postfix) with ESMTP id C0A5A14CA99;
Fri, 22 Jan 2016 17:24:25 +0100 (CET)
Received: by vingummi.stacken.kth.se (Postfix)
id 45F7E14CAC2; Fri, 22 Jan 2016 17:24:25 +0100 (CET)
Delivered-To: al_stacken_kth_se______________arla-drinkers@vingummi.stacken.kth.se
Received: from mx5.kth.se (mx5.kth.se [130.237.32.10])
by vingummi.stacken.kth.se (Postfix) with ESMTPS id 423F514C913
for <arla-drinkers@stacken.kth.se>; Fri, 22 Jan 2016 17:24:25 +0100 (CET)
Received: from mx5.kth.se (localhost [127.0.0.1])
by mx5.kth.se (Postfix) with ESMTP id 302C22400A8
for <arla-drinkers@stacken.kth.se>; Fri, 22 Jan 2016 17:24:25 +0100 (CET)
X-Virus-Scanned: by amavisd-new at kth.se
X-Amavis-OS-Fingerprint: Windows NT kernel; dist: 9; link: Ethernet or modem;
params: generic fuzzy; raw_mtu: 1500; raw_sig:
6:55+9:0:1440:mss*45,0:mss,nop,ws,nop,nop,sok::0,
[2001:6b0:e:2018::156]:54175
Received: from mx5.kth.se ([127.0.0.1])
by mx5.kth.se (mx5.kth.se [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id Ii1F-8-RTlNd for <arla-drinkers@stacken.kth.se>;
Fri, 22 Jan 2016 17:24:24 +0100 (CET)
Received: from mail.acc.umu.se (mail.acc.umu.se [IPv6:2001:6b0:e:2018::156])
by mx5.kth.se (Postfix) with ESMTPS
for <arla-drinkers@stacken.kth.se>; Fri, 22 Jan 2016 17:24:24 +0100 (CET)
Received: from localhost (localhost [127.0.0.1])
by amavisd-new (Postfix) with ESMTP id 3A06C60E
for <arla-drinkers@stacken.kth.se>; Fri, 22 Jan 2016 17:24:24 +0100 (MET)
X-Virus-Scanned: amavisd-new at acc.umu.se
Received: from suiko.acc.umu.se (suiko.acc.umu.se [IPv6:2001:6b0:e:2018::162])
by mail.acc.umu.se (Postfix) with ESMTP id AEAB860D
for <arla-drinkers@stacken.kth.se>; Fri, 22 Jan 2016 17:24:22 +0100 (MET)
Received: by suiko.acc.umu.se (Postfix, from userid 10005)
id 9E6D744B8C; Fri, 22 Jan 2016 17:24:22 +0100 (CET)
Received: from localhost (localhost [127.0.0.1])
by suiko.acc.umu.se (Postfix) with ESMTP id 8C51844B8B
for <arla-drinkers@stacken.kth.se>; Fri, 22 Jan 2016 17:24:22 +0100 (CET)
Date: Fri, 22 Jan 2016 17:24:22 +0100 (CET)
From: Bo Branten <bosse@acc.umu.se>
To: arla-drinkers@stacken.kth.se
Subject: Bug found in Arla CVS
Message-ID: <alpine.DEB.2.10.1601221714300.14802@suiko.acc.umu.se>
User-Agent: Alpine 2.10 (DEB 1266 2009-07-14)
MIME-Version: 1.0
Content-Type: MULTIPART/MIXED;
BOUNDARY="-276651502-256313640-1453479862=:14802"
X-BeenThere: arla-drinkers@stacken.kth.se
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: Arla discussions <arla-drinkers.stacken.kth.se>
List-Unsubscribe: <https://lists.stacken.kth.se/mailman/options/arla-drinkers>,
<mailto:arla-drinkers-request@stacken.kth.se?subject=unsubscribe>
List-Archive: <http://lists.stacken.kth.se/pipermail/arla-drinkers/>
List-Post: <mailto:arla-drinkers@stacken.kth.se>
List-Help: <mailto:arla-drinkers-request@stacken.kth.se?subject=help>
List-Subscribe: <https://lists.stacken.kth.se/mailman/listinfo/arla-drinkers>,
<mailto:arla-drinkers-request@stacken.kth.se?subject=subscribe>
Errors-To: arla-drinkers-bounces@stacken.kth.se
Sender: "Arla-drinkers" <arla-drinkers-bounces@stacken.kth.se>
This message is in MIME format. The first part should be readable text,
while the remaining parts are likely unreadable without MIME-aware tools.
---276651502-256313640-1453479862=:14802
Content-Type: TEXT/PLAIN; format=flowed; charset=US-ASCII
Hello,
when testing Arla I found a bug in the CVS version that I thought I should
warn you about:
In the CVS version they changed from uppercase to lowercase file and dir
names in the cache:
2c2
< * Copyright (c) 2005-2006, Stockholms Universitet
---
> * Copyright (c) 2005-2007, Stockholms Universitet
34c34
< /* $Id: nnpfs_blocks.h,v 1.2 2006/10/24 16:33:31 tol Exp $ */
---
> /* $Id: nnpfs_blocks.h,v 1.3 2007/01/24 17:09:17 tol Exp $ */
39,41c39,45
< #define NNPFS_CACHE_FILE_PATH "%02X/%02X/%02llX"
< #define NNPFS_CACHE_DIR_PATH "%02X/%02X@"
< #define NNPFS_CACHE_PATH_SIZE ( 6 +1 +2+1 +16 +1)
---
> #define NNPFS_CACHE_FILE_DIR1 "%02x"
> #define NNPFS_CACHE_FILE_DIR_PATH NNPFS_CACHE_FILE_DIR1 "/" NNPFS_CACHE_FILE_DIR1
> #define NNPFS_CACHE_FILE_BLOCK_PATH "%02llx"
>
> #define NNPFS_CACHE_FILE_PATH NNPFS_CACHE_FILE_DIR_PATH "/" NNPFS_CACHE_FILE_BLOCK_PATH
> #define NNPFS_CACHE_DIR_PATH NNPFS_CACHE_FILE_DIR_PATH "@"
> #define NNPFS_CACHE_PATH_SIZE ( 6 +1 +2+1 +16 +1 )
However the old look was hardcoded in some places in arlad/fcache.c, here
is a patch that corrects this: (Also remember this when mixing different
versions of arlad and nnpfs)
--- src/arla-0.90/arlad/fcache.c 2006-12-11 17:23:24.000000000 +0100
+++ src/arla-0.90-new/arlad/fcache.c 2016-01-22 17:00:43.000000000 +0100
@@ -713,7 +713,7 @@ fcache_have_wanted(FCacheEntry *entry, u
int
fcache_dir_name (FCacheEntry *entry, char *s, size_t len)
{
- return snprintf (s, len, "%02X", entry->index / 0x100);
+ return snprintf (s, len, NNPFS_CACHE_FILE_DIR1, entry->index / 0x100);
}
/*
@@ -723,7 +723,7 @@ fcache_dir_name (FCacheEntry *entry, cha
static int
fcache_file_name (FCacheEntry *entry, char *s, size_t len)
{
- return snprintf (s, len, "%02X/%02X",
+ return snprintf (s, len, NNPFS_CACHE_FILE_DIR_PATH,
entry->index / 0x100, entry->index % 0x100);
}
@@ -815,7 +815,7 @@ fcache_fhget (char *filename, fcache_cac
int ret, a, b;
char buf[1024];
- ret = sscanf(filename, "%02X/%02X", &a, &b);
+ ret = sscanf(filename, NNPFS_CACHE_FILE_DIR_PATH, &a, &b);
if (ret != 2)
return EINVAL;
@@ -824,7 +824,7 @@ fcache_fhget (char *filename, fcache_cac
ret = snprintf((char *)handle->nnpfs_handle,
sizeof(handle->nnpfs_handle),
- "%s\\%02X\\%02X", buf, a, b);
+ "%s\\" NNPFS_CACHE_FILE_DIR_PATH, buf, a, b);
if (ret > 0 && ret < sizeof(handle->nnpfs_handle))
handle->valid = 1;
---276651502-256313640-1453479862=:14802
Content-Type: TEXT/PLAIN; charset=US-ASCII; name=patch-arla-fcache
Content-Transfer-Encoding: BASE64
Content-ID: <alpine.DEB.2.10.1601221724220.14802@suiko.acc.umu.se>
Content-Description:
Content-Disposition: attachment; filename=patch-arla-fcache
LS0tIHNyYy9hcmxhLTAuOTAvYXJsYWQvZmNhY2hlLmMJMjAwNi0xMi0xMSAx
NzoyMzoyNC4wMDAwMDAwMDAgKzAxMDANCisrKyBzcmMvYXJsYS0wLjkwLW5l
dy9hcmxhZC9mY2FjaGUuYwkyMDE2LTAxLTIyIDE3OjAwOjQzLjAwMDAwMDAw
MCArMDEwMA0KQEAgLTcxMyw3ICs3MTMsNyBAQCBmY2FjaGVfaGF2ZV93YW50
ZWQoRkNhY2hlRW50cnkgKmVudHJ5LCB1DQogaW50DQogZmNhY2hlX2Rpcl9u
YW1lIChGQ2FjaGVFbnRyeSAqZW50cnksIGNoYXIgKnMsIHNpemVfdCBsZW4p
DQogew0KLSAgICByZXR1cm4gc25wcmludGYgKHMsIGxlbiwgIiUwMlgiLCBl
bnRyeS0+aW5kZXggLyAweDEwMCk7DQorICAgIHJldHVybiBzbnByaW50ZiAo
cywgbGVuLCBOTlBGU19DQUNIRV9GSUxFX0RJUjEsIGVudHJ5LT5pbmRleCAv
IDB4MTAwKTsNCiB9DQogDQogLyoNCkBAIC03MjMsNyArNzIzLDcgQEAgZmNh
Y2hlX2Rpcl9uYW1lIChGQ2FjaGVFbnRyeSAqZW50cnksIGNoYQ0KIHN0YXRp
YyBpbnQNCiBmY2FjaGVfZmlsZV9uYW1lIChGQ2FjaGVFbnRyeSAqZW50cnks
IGNoYXIgKnMsIHNpemVfdCBsZW4pDQogew0KLSAgICByZXR1cm4gc25wcmlu
dGYgKHMsIGxlbiwgIiUwMlgvJTAyWCIsDQorICAgIHJldHVybiBzbnByaW50
ZiAocywgbGVuLCBOTlBGU19DQUNIRV9GSUxFX0RJUl9QQVRILA0KIAkJICAg
ICBlbnRyeS0+aW5kZXggLyAweDEwMCwgZW50cnktPmluZGV4ICUgMHgxMDAp
Ow0KIH0NCiANCkBAIC04MTUsNyArODE1LDcgQEAgZmNhY2hlX2ZoZ2V0IChj
aGFyICpmaWxlbmFtZSwgZmNhY2hlX2NhYw0KIAlpbnQgcmV0LCBhLCBiOw0K
IAljaGFyIGJ1ZlsxMDI0XTsNCiANCi0JcmV0ID0gc3NjYW5mKGZpbGVuYW1l
LCAiJTAyWC8lMDJYIiwgJmEsICZiKTsNCisJcmV0ID0gc3NjYW5mKGZpbGVu
YW1lLCBOTlBGU19DQUNIRV9GSUxFX0RJUl9QQVRILCAmYSwgJmIpOw0KIAlp
ZiAocmV0ICE9IDIpDQogCSAgICByZXR1cm4gRUlOVkFMOw0KIA0KQEAgLTgy
NCw3ICs4MjQsNyBAQCBmY2FjaGVfZmhnZXQgKGNoYXIgKmZpbGVuYW1lLCBm
Y2FjaGVfY2FjDQogCQ0KIAlyZXQgPSBzbnByaW50ZigoY2hhciAqKWhhbmRs
ZS0+bm5wZnNfaGFuZGxlLCANCiAJCSAgICAgICBzaXplb2YoaGFuZGxlLT5u
bnBmc19oYW5kbGUpLA0KLQkJICAgICAgICIlc1xcJTAyWFxcJTAyWCIsIGJ1
ZiwgYSwgYik7DQorCQkgICAgICAgIiVzXFwiIE5OUEZTX0NBQ0hFX0ZJTEVf
RElSX1BBVEgsIGJ1ZiwgYSwgYik7DQogDQogCWlmIChyZXQgPiAwICYmIHJl
dCA8IHNpemVvZihoYW5kbGUtPm5ucGZzX2hhbmRsZSkpDQogCSAgICBoYW5k
bGUtPnZhbGlkID0gMTsNCg==
---276651502-256313640-1453479862=:14802
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
_______________________________________________
Arla-drinkers mailing list
Arla-drinkers@stacken.kth.se
https://lists.stacken.kth.se/mailman/listinfo/arla-drinkers
---276651502-256313640-1453479862=:14802--
