From owner-freebsd-stable Tue May 4 4:42:44 1999 Delivered-To: freebsd-stable@freebsd.org Received: from adelphi.physics.adelaide.edu.au (adelphi.physics.adelaide.edu.au [129.127.36.247]) by hub.freebsd.org (Postfix) with ESMTP id A8D2B14D7D for ; Tue, 4 May 1999 04:42:39 -0700 (PDT) (envelope-from kkennawa@physics.adelaide.edu.au) Received: from bragg (bragg [129.127.36.34]) by adelphi.physics.adelaide.edu.au (8.8.8/8.8.8/UofA-1.5) with SMTP id VAA02821 for ; Tue, 4 May 1999 21:12:38 +0930 (CST) Received: from localhost by bragg; (5.65/1.1.8.2/05Aug95-0227PM) id AA10968; Tue, 4 May 1999 21:13:10 +0930 Date: Tue, 4 May 1999 21:13:10 +0930 (CST) From: Kris Kennaway X-Sender: kkennawa@bragg To: stable@freebsd.org Subject: tcopy patch for large tapes Message-Id: Mime-Version: 1.0 Content-Type: MULTIPART/MIXED; BOUNDARY="0-1619344480-925818190=:32078" Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. Send mail to mime@docserver.cac.washington.edu for more info. --0-1619344480-925818190=:32078 Content-Type: TEXT/PLAIN; charset=US-ASCII Can someone with appropriate hardware test the following patch to usr.bin/tcopy/tcopy.c: ---------------------------- revision 1.5 date: 1999/04/30 13:13:32; author: phk; state: Exp; lines: +35 -15 Tcopy uses 32 bit unsigned to accumulate a count of bytes read/written. That doesn't work well for tapes over 4G. I use tcopy a lot to write images of a tape to tape as tape to tape copying is terribly slow. Slower than it should be. Quickly found out tcopy can not rewind a file when doing copy/verify. PR: 11386 Submitted by: David Kelly dkelly@hiwaay.net Reviewed by: phk ---------------------------- The patch should apply cleanly to -stable and looks like a good MFC candidate for 3.2, providing it works. Kris ----- "That suit's sharper than a page of Oscar Wilde witticisms that's been rolled up into a point, sprinkled with lemon juice and jabbed into someone's eye" "Wow, that's sharp!" - Ace Rimmer and the Cat, _Red Dwarf_ --0-1619344480-925818190=:32078 Content-Type: TEXT/PLAIN; charset=US-ASCII; name="tcopy.patch" Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: Content-Disposition: attachment; filename="tcopy.patch" LS0tIHRjb3B5LmMub3JpZwlUaHUgQXVnIDE0IDE2OjExOjAwIDE5OTcNCisr KyB0Y29weS5jCVNhdCBNYXkgIDEgMjE6MDI6MDUgMTk5OQ0KQEAgLTQyLDcg KzQyLDcgQEANCiBzdGF0aWMgY2hhciBzY2NzaWRbXSA9ICJAKCMpdGNvcHku Ywk4LjIgKEJlcmtlbGV5KSA0LzE3Lzk0IjsNCiAjZW5kaWYNCiBzdGF0aWMg Y29uc3QgY2hhciByY3NpZFtdID0NCi0JIiRJZDogdGNvcHkuYyx2IDEuNCAx OTk3LzA4LzE0IDA2OjQxOjAwIGNoYXJuaWVyIEV4cCAkIjsNCisJIiRJZDog dGNvcHkuYyx2IDEuNSAxOTk5LzA0LzMwIDEzOjEzOjMyIHBoayBFeHAgJCI7 DQogI2VuZGlmIC8qIG5vdCBsaW50ICovDQogDQogI2luY2x1ZGUgPHN5cy90 eXBlcy5oPg0KQEAgLTY1LDcgKzY1LDcgQEANCiAjZGVmaW5lCU5PQ09VTlQJ KC0yKQ0KIA0KIGludAlmaWxlbiwgZ3Vlc3NsZW4sIG1heGJsayA9IE1BWFJF QzsNCi11X2xvbmcJbGFzdHJlYywgcmVjb3JkLCBzaXplLCB0c2l6ZTsNCit1 X2ludDY0X3QJbGFzdHJlYywgcmVjb3JkLCBzaXplLCB0c2l6ZTsNCiBGSUxF CSptc2cgPSBzdGRvdXQ7DQogDQogdm9pZAkqZ2V0c3BhY2UgX19QKChpbnQp KTsNCkBAIC03Myw2ICs3Myw3IEBADQogc3RhdGljIHZvaWQJIHVzYWdlIF9f UCgodm9pZCkpOw0KIHZvaWQJIHZlcmlmeSBfX1AoKGludCwgaW50LCBjaGFy ICopKTsNCiB2b2lkCSB3cml0ZW9wIF9fUCgoaW50LCBpbnQpKTsNCit2b2lk CXJld2luZF90YXBlKGludCk7DQogDQogaW50DQogbWFpbihhcmdjLCBhcmd2 KQ0KQEAgLTE1NiwxNiArMTU3LDE2IEBADQogCQkJCWlmIChucmVhZCA+PSAw KQ0KIAkJCQkJZ290byByMTsNCiAJCQl9DQotCQkJZXJyKDEsICJyZWFkIGVy cm9yLCBmaWxlICVkLCByZWNvcmQgJWxkIiwgZmlsZW4sIHJlY29yZCk7DQor CQkJZXJyKDEsICJyZWFkIGVycm9yLCBmaWxlICVkLCByZWNvcmQgJXF1Iiwg ZmlsZW4sIHJlY29yZCk7DQogCQl9IGVsc2UgaWYgKG5yZWFkICE9IGxhc3Ru cmVhZCkgew0KIAkJCWlmIChsYXN0bnJlYWQgIT0gMCAmJiBsYXN0bnJlYWQg IT0gTk9DT1VOVCkgew0KIAkJCQlpZiAobGFzdHJlYyA9PSAwICYmIG5yZWFk ID09IDApDQotCQkJCQlmcHJpbnRmKG1zZywgIiVsZCByZWNvcmRzXG4iLCBy ZWNvcmQpOw0KKwkJCQkJZnByaW50Zihtc2csICIlcXUgcmVjb3Jkc1xuIiwg cmVjb3JkKTsNCiAJCQkJZWxzZSBpZiAocmVjb3JkIC0gbGFzdHJlYyA+IDEp DQotCQkJCQlmcHJpbnRmKG1zZywgInJlY29yZHMgJWxkIHRvICVsZFxuIiwN CisJCQkJCWZwcmludGYobXNnLCAicmVjb3JkcyAlcXUgdG8gJXF1XG4iLA0K IAkJCQkJICAgIGxhc3RyZWMsIHJlY29yZCk7DQogCQkJCWVsc2UNCi0JCQkJ CWZwcmludGYobXNnLCAicmVjb3JkICVsZFxuIiwgbGFzdHJlYyk7DQorCQkJ CQlmcHJpbnRmKG1zZywgInJlY29yZCAlcXVcbiIsIGxhc3RyZWMpOw0KIAkJ CX0NCiAJCQlpZiAobnJlYWQgIT0gMCkNCiAJCQkJZnByaW50Zihtc2csICJm aWxlICVkOiBibG9jayBzaXplICVkOiAiLA0KQEAgLTE4Myw5ICsxODQsOSBA QA0KIAkJCQludyA9IHdyaXRlKG91dHAsIGJ1ZmYsIG5yZWFkKTsNCiAJCQkJ aWYgKG53ICE9IG5yZWFkKSB7DQogCQkJCQlpZiAobncgPT0gLTEpIHsNCi0J CQkJCXdhcm4oIndyaXRlIGVycm9yLCBmaWxlICVkLCByZWNvcmQgJWxkIiwg ZmlsZW4sIHJlY29yZCk7DQorCQkJCQl3YXJuKCJ3cml0ZSBlcnJvciwgZmls ZSAlZCwgcmVjb3JkICVxdSIsIGZpbGVuLCByZWNvcmQpOw0KIAkJCQkJfSBl bHNlIHsNCi0JCQkJCXdhcm54KCJ3cml0ZSBlcnJvciwgZmlsZSAlZCwgcmVj b3JkICVsZCIsIGZpbGVuLCByZWNvcmQpOw0KKwkJCQkJd2FybngoIndyaXRl IGVycm9yLCBmaWxlICVkLCByZWNvcmQgJXF1IiwgZmlsZW4sIHJlY29yZCk7 DQogCQkJCQl3YXJueCgid3JpdGUgKCVkKSAhPSByZWFkICglZCkiLCBudywg bnJlYWQpOw0KIAkJCQkJfQ0KIAkJCQkJZXJyeCg1LCAiY29weSBhYm9ydGVk Iik7DQpAQCAtMTk5LDcgKzIwMCw3IEBADQogCQkJCWJyZWFrOw0KIAkJCX0N CiAJCQlmcHJpbnRmKG1zZywNCi0JCQkgICAgImZpbGUgJWQ6IGVvZiBhZnRl ciAlbHUgcmVjb3JkczogJWx1IGJ5dGVzXG4iLA0KKwkJCSAgICAiZmlsZSAl ZDogZW9mIGFmdGVyICVxdSByZWNvcmRzOiAlcXUgYnl0ZXNcbiIsDQogCQkJ ICAgIGZpbGVuLCByZWNvcmQsIHNpemUpOw0KIAkJCW5lZWRlb2YgPSAxOw0K IAkJCWZpbGVuKys7DQpAQCAtMjA5LDE0ICsyMTAsMTQgQEANCiAJCX0NCiAJ CWxhc3RucmVhZCA9IG5yZWFkOw0KIAl9DQotCWZwcmludGYobXNnLCAidG90 YWwgbGVuZ3RoOiAlbHUgYnl0ZXNcbiIsIHRzaXplKTsNCisJZnByaW50Ziht c2csICJ0b3RhbCBsZW5ndGg6ICVxdSBieXRlc1xuIiwgdHNpemUpOw0KIAko dm9pZClzaWduYWwoU0lHSU5ULCBvbGRzaWcpOw0KIAlpZiAob3AgPT0gQ09Q WSB8fCBvcCA9PSBDT1BZVkVSSUZZKSB7DQogCQl3cml0ZW9wKG91dHAsIE1U V0VPRik7DQogCQl3cml0ZW9wKG91dHAsIE1UV0VPRik7DQogCQlpZiAob3Ag PT0gQ09QWVZFUklGWSkgew0KLQkJCXdyaXRlb3Aob3V0cCwgTVRSRVcpOw0K LQkJCXdyaXRlb3AoaW5wLCBNVFJFVyk7DQorCQkJcmV3aW5kX3RhcGUob3V0 cCk7DQorCQkJcmV3aW5kX3RhcGUoaW5wKTsNCiAJCQl2ZXJpZnkoaW5wLCBv dXRwLCBidWZmKTsNCiAJCX0NCiAJfQ0KQEAgLTI4MywxMCArMjg0LDEwIEBA DQogew0KIAlpZiAocmVjb3JkKQ0KIAkJaWYgKHJlY29yZCAtIGxhc3RyZWMg PiAxKQ0KLQkJCWZwcmludGYobXNnLCAicmVjb3JkcyAlbGQgdG8gJWxkXG4i LCBsYXN0cmVjLCByZWNvcmQpOw0KKwkJCWZwcmludGYobXNnLCAicmVjb3Jk cyAlcXUgdG8gJXF1XG4iLCBsYXN0cmVjLCByZWNvcmQpOw0KIAkJZWxzZQ0K LQkJCWZwcmludGYobXNnLCAicmVjb3JkICVsZFxuIiwgbGFzdHJlYyk7DQot CWZwcmludGYobXNnLCAiaW50ZXJydXB0IGF0IGZpbGUgJWQ6IHJlY29yZCAl bGRcbiIsIGZpbGVuLCByZWNvcmQpOw0KKwkJCWZwcmludGYobXNnLCAicmVj b3JkICVxdVxuIiwgbGFzdHJlYyk7DQorCWZwcmludGYobXNnLCAiaW50ZXJy dXB0IGF0IGZpbGUgJWQ6IHJlY29yZCAlcXVcbiIsIGZpbGVuLCByZWNvcmQp Ow0KIAlmcHJpbnRmKG1zZywgInRvdGFsIGxlbmd0aDogJWxkIGJ5dGVzXG4i LCB0c2l6ZSArIHNpemUpOw0KIAlleGl0KDEpOw0KIH0NCkBAIC0zMTksNCAr MzIwLDIzIEBADQogew0KIAlmcHJpbnRmKHN0ZGVyciwgInVzYWdlOiB0Y29w eSBbLWN2eF0gWy1zIG1heGJsa10gW3NyYyBbZGVzdF1dXG4iKTsNCiAJZXhp dCgxKTsNCit9DQorDQordm9pZA0KK3Jld2luZF90YXBlKGludCBmZCkNCit7 DQorCXN0cnVjdCBzdGF0IHNwOw0KKw0KKwlpZihmc3RhdChmZCwgJnNwKSkN CisJCWVycngoMTIsICJmc3RhdCBpbiByZXdpbmQiKTsNCisNCisJLyoNCisJ ICogZG9uJ3Qgd2FudCB0byBkbyB0YXBlIGlvY3RsIG9uIHJlZ3VsYXIgZmls ZXM6DQorCSAqLw0KKwlpZiggU19JU1JFRyhzcC5zdF9tb2RlKSApIHsNCisJ CWlmKCBsc2VlayhmZCwgMCwgU0VFS19TRVQpID09IC0xICkNCisJCQllcnJ4 KDEzLCAibHNlZWsiKTsNCisJfSBlbHNlDQorCQkvKiAgYXNzdW1lIGl0cyBh IHRhcGUJKi8NCisJCXdyaXRlb3AoZmQsIE1UUkVXKTsNCiB9DQo= --0-1619344480-925818190=:32078-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message