From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1RbZk8-0004Pg-ER for mharc-grub-devel@gnu.org; Fri, 16 Dec 2011 10:30:40 -0500 Received: from eggs.gnu.org ([140.186.70.92]:54924) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RbZk2-0004Nb-1M for grub-devel@gnu.org; Fri, 16 Dec 2011 10:30:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RbZjw-0004Eo-3r for grub-devel@gnu.org; Fri, 16 Dec 2011 10:30:33 -0500 Received: from mail-ee0-f41.google.com ([74.125.83.41]:39648) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RbZjv-0004Ef-Rq for grub-devel@gnu.org; Fri, 16 Dec 2011 10:30:28 -0500 Received: by eekc41 with SMTP id c41so3496041eek.0 for ; Fri, 16 Dec 2011 07:30:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=L4So4U/BEB3iNTIHxGkQKUphOOg2UFnhGasOOeMkkX8=; b=bgA5pGAyojY+vGLN0Dz3q5/+/FcwdmKWSd/g/c4q5fRKhg4qycgtcMi5YnaNiB2kSS t1Efrajzf1PeYuFMo3NoAVzyhKaAJk4LNsuso10GCjkUUJQdc7NN0siHKqH5wniick2I RJFUJHMa7QcjtZChkfRfD9mLGWvfls7KbRQQA= Received: by 10.14.18.40 with SMTP id k40mr3443125eek.0.1324049426542; Fri, 16 Dec 2011 07:30:26 -0800 (PST) Received: from debian.x201.phnet (67-234.197-178.cust.bluewin.ch. [178.197.234.67]) by mx.google.com with ESMTPS id x12sm39266738eef.9.2011.12.16.07.30.23 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 16 Dec 2011 07:30:25 -0800 (PST) Message-ID: <4EEB640B.2060605@gmail.com> Date: Fri, 16 Dec 2011 16:30:19 +0100 From: =?UTF-8?B?VmxhZGltaXIgJ8+GLWNvZGVyL3BoY29kZXInIFNlcmJpbmVua28=?= User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.24) Gecko/20111114 Icedove/3.1.16 MIME-Version: 1.0 To: The development of GNU GRUB Subject: Re: New command to check NT's hibernation state References: <4EE2F646.1050309@gmail.com> In-Reply-To: <4EE2F646.1050309@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.83.41 Cc: Peter Lustig X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Dec 2011 15:30:38 -0000 On 10.12.2011 07:03, Peter Lustig wrote: > /* nthibr.c - tests whether an MS Windows system partition is hibernated */ > /* > * GRUB -- GRand Unified Bootloader > * Copyright (C) 2007,2008,2009,2011 Free Software Foundation, Inc. > * > * GRUB 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 3 of the License, or > * (at your option) any later version. > * > * GRUB is distributed in the hope that it will be useful, > * but WITHOUT ANY WARRANTY; without even the implied warranty of > * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > * GNU General Public License for more details. > * > * You should have received a copy of the GNU General Public License > * along with GRUB. If not, see. > */ > > #include > #include > #include > #include > #include > #include > #include > #include > #include > #include > > GRUB_MOD_LICENSE("GPLv3+"); > > /* Define this 'empty' array to let the '-h' and '-u' switches be processed */ > static const struct grub_arg_option options[] = { > {0, 0, 0, 0, 0, 0} > }; Please remove this and use grub_command_t > static grub_err_t > grub_cmd_nthibr (grub_extcmd_context_t ctxt __attribute__ ((unused)), > int argc, char **args) > { > char *partition_name = 0, *hibr_file_path = 0, hibr_file_magic[5]; > grub_size_t name_length; > grub_ssize_t magic_size; > grub_disk_t partition; > grub_file_t hibr_file = 0; > > /* Check argument count */ > if (!argc) > return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("too few arguments")); > else if (argc> 1) > return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("too many arguments")); > Either ignore trailing argument or put both in one check != 1 > /* Make copy of partition specifier, so it can be modified (if needed) */ > name_length = grub_strlen (args[0]); > partition_name = grub_zalloc (name_length + 3); > if (!partition_name) > goto exit; > grub_strcpy (partition_name, args[0]); > > /* Ensure partition specifier start with a '(' */ > if (partition_name[0] != '(') > { > grub_memmove (partition_name + 1, partition_name, name_length++); > partition_name[0] = '('; > } > > /* Ensure partition specifier ends with a ')' */ > if (partition_name[name_length - 1] != ')') > partition_name[(++name_length) - 1] = ')'; > > /* Check if partition actually exists */ > partition_name[name_length - 1] = '\0'; > partition = grub_disk_open (partition_name + 1); > if (!partition) > goto exit; > grub_disk_close (partition); > partition_name[name_length - 1] = ')'; > > /* Build path to 'hiberfil.sys' */ > hibr_file_path = grub_malloc ((grub_strlen (partition_name) > + grub_strlen ("/hiberfil.sys") + 1)); > if (!hibr_file_path) > goto exit; > grub_strcpy (hibr_file_path, partition_name); > grub_strcat (hibr_file_path, "/hiberfil.sys"); > It would be more efficient if you just try to open file and see what error you get. Actually you don't even need to distinguish between error cases here since you return the error you encountered. This will also save one useless alloc. > /* Try to open 'hiberfil.sys' */ > hibr_file = grub_file_open (hibr_file_path); > if (!hibr_file) > { > if (grub_errno == GRUB_ERR_FILE_NOT_FOUND) > grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("'hiberfil.sys' not found")); This overriding is unnecessary. FS code already provides this message > goto exit; > } > > /* Try to read magic number of 'hiberfil.sys' */ > magic_size = sizeof (hibr_file_magic) - 1; > grub_memset (hibr_file_magic, 0, sizeof (hibr_file_magic)); > if (grub_file_read (hibr_file, hibr_file_magic, magic_size)< magic_size) > { > if (!grub_errno) > grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("'hiberfil.sys' too small")); > goto exit; > } > > /* Return SUCCESS if magic indicates file is active; else return FAILURE */ > if (!grub_strncasecmp ("hibr", hibr_file_magic, magic_size)) > grub_error (GRUB_ERR_NONE, "true"); > else > grub_error (GRUB_ERR_TEST_FAILURE, "false"); > > exit: > /* Ensure unmanaged resources are cleaned up */ > if (partition_name) > grub_free (partition_name); > if (hibr_file_path) > grub_free (hibr_file_path); No need to check that argument to free is non-NULL. > if (hibr_file) > grub_file_close (hibr_file); > > return grub_errno; > } > > static grub_extcmd_t cmd; > > GRUB_MOD_INIT (nthibr) > { > cmd = grub_register_extcmd ("nthibr", grub_cmd_nthibr, 0, > N_("DEVICE"), > N_("Test whether an NT system partition " > "is hibernated."), > options); > } > > GRUB_MOD_FINI (nthibr) > { > grub_unregister_extcmd (cmd); > } > -- Regards Vladimir 'φ-coder/phcoder' Serbinenko