am 933f0b88: am f21b6b92: am 87a56eb6: Merge "Use the getopt function in compliance with the standard."

* commit '933f0b88e4232f58f171b8217d7871f97a927c57':
  Use the getopt function in compliance with the standard.