From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sun, 13 Jun 2010 04:28:24 +0000 (+0530)
Subject: merge with mainline
X-Git-Tag: 1.99~600^2~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eedda768832a831165f1b55fa88a3545c0b6366f;p=thirdparty%2Fgrub.git

merge with mainline
---

eedda768832a831165f1b55fa88a3545c0b6366f
diff --cc include/grub/script_sh.h
index 2ada5d474,9bfc7e4bb..6471c7de3
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@@ -350,27 -345,14 +355,29 @@@ grub_script_function_t grub_script_func
  						    struct grub_script *cmd);
  void grub_script_function_remove (const char *name);
  grub_script_function_t grub_script_function_find (char *functionname);
- int grub_script_function_iterate (int (*iterate) (grub_script_function_t));
 -
  grub_err_t grub_script_function_call (grub_script_function_t func,
  				      int argc, char **args);
  
  char **
  grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist, int *count);
  
+ grub_err_t
+ grub_normal_parse_line (char *line, grub_reader_getline_t getline);
+ 
 +static inline struct grub_script *
 +grub_script_get (struct grub_script *script)
 +{
 +  script->refcnt++;
 +  return script;
 +}
 +
 +static inline void
 +grub_script_put (struct grub_script *script)
 +{
 +  if (script->refcnt == 0)
 +    grub_script_free (script);
 +  else
 +    script->refcnt--;
 +}
 +
  #endif /* ! GRUB_NORMAL_PARSER_HEADER */
diff --cc script/parser.y
index 1202fef29,cc08af37a..e32ba3cec
--- a/script/parser.y
+++ b/script/parser.y
@@@ -20,6 -20,6 +20,7 @@@
  %{
  #include <grub/script_sh.h>
  #include <grub/mm.h>
++#include <grub/misc.h>
  
  #define YYFREE          grub_free
  #define YYMALLOC        grub_malloc