From patchwork Fri Jan 27 18:30:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 138269 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 87A29B6F67 for ; Sat, 28 Jan 2012 05:30:40 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RqqYU-000815-5f; Fri, 27 Jan 2012 18:29:46 +0000 Received: from mail-pz0-f49.google.com ([209.85.210.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1RqqYQ-00080b-FZ for linux-mtd@lists.infradead.org; Fri, 27 Jan 2012 18:29:42 +0000 Received: by dadz9 with SMTP id z9so783370dad.36 for ; Fri, 27 Jan 2012 10:29:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=uFKppkSQ1MpQslqNTIkQCMAEnuKFV5R8gBEu+f93nKk=; b=TlrOFgeSiiKU3A9TsdLeQgYQdduc/vAmLgF/W4KcaYZmrcanlMthHxZcfNNUj4gvvr wI959TTtP2hgZPOGEZvjV6a3ed6szbw73CxtlsgWneH0omet1gD/rPWRrhcpQJCenf2F mNckDtzuVWJ7wax8jpCdOYQj9/ZNI+S+uhsXA= Received: by 10.68.75.11 with SMTP id y11mr16364612pbv.51.1327688981093; Fri, 27 Jan 2012 10:29:41 -0800 (PST) Received: from localhost.localdomain (5520-maca-inet1-outside.broadcom.com. [216.31.211.11]) by mx.google.com with ESMTPS id lk11sm21863460pbb.0.2012.01.27.10.29.39 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 27 Jan 2012 10:29:39 -0800 (PST) From: Brian Norris To: Subject: [PATCH 1/2] libmtd: add `mtd_dev_present()' library function Date: Fri, 27 Jan 2012 10:30:45 -0800 Message-Id: <1327689046-1450-1-git-send-email-computersforpeace@gmail.com> X-Mailer: git-send-email 1.7.5.4 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.210.49 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (computersforpeace[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Brian Foster , Brian Norris , Artem Bityutskiy X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Will be used for `mtdinfo --all' Signed-off-by: Brian Norris --- include/libmtd.h | 9 +++++++++ lib/libmtd.c | 22 ++++++++++++---------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/include/libmtd.h b/include/libmtd.h index 07c304a..a78c8cb 100644 --- a/include/libmtd.h +++ b/include/libmtd.h @@ -106,6 +106,15 @@ libmtd_t libmtd_open(void); void libmtd_close(libmtd_t desc); /** + * mtd_dev_present - check whether a MTD device is present. + * @desc: MTD library descriptor + * @mtd_num: MTD device number to check + * + * This function returns %1 if MTD device is present and %0 if not. + */ +int mtd_dev_present(libmtd_t desc, int mtd_num); + +/** * mtd_get_info - get general MTD information. * @desc: MTD library descriptor * @info: the MTD device information is returned here diff --git a/lib/libmtd.c b/lib/libmtd.c index c6e5b20..9786e83 100644 --- a/lib/libmtd.c +++ b/lib/libmtd.c @@ -713,10 +713,18 @@ out_close: return -1; } +int mtd_dev_present(libmtd_t desc, int mtd_num) { + struct stat st; + struct libmtd *lib = (struct libmtd *)desc; + char file[strlen(lib->mtd) + 10]; + + sprintf(file, lib->mtd, mtd_num); + return !stat(file, &st); +} + int mtd_get_dev_info1(libmtd_t desc, int mtd_num, struct mtd_dev_info *mtd) { int ret; - struct stat st; struct libmtd *lib = (struct libmtd *)desc; memset(mtd, 0, sizeof(struct mtd_dev_info)); @@ -724,15 +732,9 @@ int mtd_get_dev_info1(libmtd_t desc, int mtd_num, struct mtd_dev_info *mtd) if (!lib->sysfs_supported) return legacy_get_dev_info1(mtd_num, mtd); - else { - char file[strlen(lib->mtd) + 10]; - - sprintf(file, lib->mtd, mtd_num); - if (stat(file, &st)) { - if (errno == ENOENT) - errno = ENODEV; - return -1; - } + else if (!mtd_dev_present(desc, mtd_num)) { + errno = ENODEV; + return -1; } if (dev_get_major(lib, mtd_num, &mtd->major, &mtd->minor))