Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/grubby/grubby.c

    Diff of /trunk/grubby/grubby.c

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 3134 by niro, Tue Jun 27 14:48:09 2017 UTC revision 3135 by niro, Tue Jul 7 11:08:26 2020 UTC
    # Line 1792  static int writeConfig(struct grubConfig Line 1792  static int writeConfig(struct grubConfig
    1792   int needs = MAIN_DEFAULT;   int needs = MAIN_DEFAULT;
    1793   struct stat sb;   struct stat sb;
    1794   int i;   int i;
    1795     int rc = 0;
    1796    
    1797   if (!strcmp(outName, "-")) {   if (!strcmp(outName, "-")) {
    1798   out = stdout;   out = stdout;
    # Line 1906  static int writeConfig(struct grubConfig Line 1907  static int writeConfig(struct grubConfig
    1907   }   }
    1908    
    1909   if (tmpOutName) {   if (tmpOutName) {
    1910   if (rename(tmpOutName, outName)) {   /* write userspace buffers */
    1911   fprintf(stderr,   if (fflush(out))
    1912   _("grubby: error moving %s to %s: %s\n"),   rc = 1;
    1913   tmpOutName, outName, strerror(errno));  
    1914   unlink(outName);   /* purge the write-back cache with fsync() */
    1915   return 1;   if (fsync(fileno(out)))
    1916     rc = 1;
    1917    
    1918     if (fclose(out))
    1919     rc = 1;
    1920    
    1921     if (rc == 0 && rename(tmpOutName, outName)) {
    1922     unlink(tmpOutName);
    1923     rc = 1;
    1924   }   }
    1925    
    1926     /* fsync() the destination directory after rename */
    1927     if (rc == 0) {
    1928     int dirfd;
    1929    
    1930     dirfd = open(dirname(strdupa(outName)), O_RDONLY);
    1931     if (dirfd < 0)
    1932     rc = 1;
    1933     else if (fsync(dirfd))
    1934     rc = 1;
    1935    
    1936     if (dirfd >= 0)
    1937     close(dirfd);
    1938     }
    1939    
    1940     if (rc == 1)
    1941     fprintf(stderr,
    1942     _("grubby: error flushing data: %m\n"));
    1943   }   }
    1944    
    1945   return 0;   return rc;
    1946  }  }
    1947    
    1948  static int numEntries(struct grubConfig *cfg)  static int numEntries(struct grubConfig *cfg)
    Legend:
    Removed from v.3134  
    changed lines
      Added in v.3135