This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch, fedora/master, updated. fedora/glibc-2.10.90-22-1-ge6afe87


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, fedora/master has been updated
       via  e6afe876da31a8f4a6fcb69fa9039139ea61a688 (commit)
      from  77b2bdde6534eefe919d3c32bfc79b62eeecb466 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=e6afe876da31a8f4a6fcb69fa9039139ea61a688

commit e6afe876da31a8f4a6fcb69fa9039139ea61a688
Author: Andreas Schwab <schwab@redhat.com>
Date:   Tue Sep 15 10:20:42 2009 +0200

    Remove unused hardlink program

diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 7ff9a31..97dd5c6 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -539,9 +539,8 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/lib/debug%{_prefix}/%{_lib}/*_p.a
 # rquota.x and rquota.h are now provided by quota
 rm -f $RPM_BUILD_ROOT%{_prefix}/include/rpcsvc/rquota.[hx]
 
-# Hardlink identical locale files together
+# Create archive of locale files
 %ifnarch %{auxarches}
-gcc -O2 -o build-%{nptl_target_cpu}-linuxnptl/hardlink fedora/hardlink.c
 olddir=`pwd`
 pushd ${RPM_BUILD_ROOT}%{_prefix}/lib/locale
 rm locale-archive || :
@@ -555,7 +554,6 @@ $olddir/build-%{nptl_target_cpu}-linuxnptl/elf/ld.so \
 rm -rf *_*
 mv locale-archive{,.tmpl}
 popd
-#build-%{nptl_target_cpu}-linuxnptl/hardlink -vc $RPM_BUILD_ROOT%{_prefix}/lib/locale
 %endif
 
 rm -f ${RPM_BUILD_ROOT}/%{_lib}/libnss1-*
diff --git a/fedora/hardlink.c b/fedora/hardlink.c
deleted file mode 100644
index 62e6337..0000000
--- a/fedora/hardlink.c
+++ /dev/null
@@ -1,344 +0,0 @@
-/* Copyright (C) 2001 Red Hat, Inc.
-
-   Written by Jakub Jelinek <jakub@redhat.com>.
-
-   This program 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 2 of the
-   License, or (at your option) any later version.
-
-   This program 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 this program; see the file COPYING.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/*  Changes by Rémy Card to use constants and add option -n.  */
-
-#define _GNU_SOURCE
-#include <sys/types.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <string.h>
-#include <dirent.h>
-#include <fcntl.h>
-
-#define NHASH	131072	/* Must be a power of 2! */
-#define NAMELEN	4096
-#define NBUF	64
-
-struct _f;
-typedef struct _h {
-  struct _h *next;
-  struct _f *chain;
-  off_t size;
-  time_t mtime;
-} h;
-
-typedef struct _d {
-  struct _d *next;
-  char name[0];
-} d;
-
-d *dirs;
-
-h *hps[NHASH];
-
-int no_link = 0;
-int verbose = 0;
-int content_only = 0;
-
-typedef struct _f {
-  struct _f *next;
-  ino_t ino;
-  dev_t dev;
-  unsigned int cksum;
-  char name[0];
-} f;
-
-inline unsigned int hash(off_t size, time_t mtime)
-{
-  return (size ^ mtime) & (NHASH - 1);
-}
-
-inline int stcmp(struct stat *st1, struct stat *st2, int content_only)
-{
-  if (content_only)
-    return st1->st_size != st2->st_size;
-  return st1->st_mode != st2->st_mode || st1->st_uid != st2->st_uid ||
-         st1->st_gid != st2->st_gid || st1->st_size != st2->st_size ||
-         st1->st_mtime != st2->st_mtime;
-}
-
-long long ndirs, nobjects, nregfiles, nmmap, ncomp, nlinks, nsaved;
-
-void doexit(int i)
-{
-  if (verbose) {
-    fprintf(stderr, "\n\n");
-    fprintf(stderr, "Directories %lld\n", ndirs);
-    fprintf(stderr, "Objects %lld\n", nobjects);
-    fprintf(stderr, "IFREG %lld\n", nregfiles);
-    fprintf(stderr, "Mmaps %lld\n", nmmap);
-    fprintf(stderr, "Comparisons %lld\n", ncomp);
-    fprintf(stderr, "%s %lld\n", (no_link ? "Would link" : "Linked"), nlinks);
-    fprintf(stderr, "%s %lld\n", (no_link ? "Would save" : "saved"), nsaved);
-  }
-  exit(i);
-}
-
-void usage(prog)
-{
-  fprintf (stderr, "Usage: %s [-cnv] directories...\n", prog);
-  exit(255);
-}
-
-unsigned int buf[NBUF];
-char nambuf1[NAMELEN], nambuf2[NAMELEN];
-
-void rf (char *name)
-{
-  struct stat st, st2, st3;
-  nobjects++;
-  if (lstat (name, &st))
-    return;
-  if (S_ISDIR (st.st_mode)) {
-    d * dp = malloc(sizeof(d) + 1 + strlen (name));
-    if (!dp) {
-      fprintf(stderr, "\nOut of memory 3\n");
-      doexit(3);
-    }
-    strcpy (dp->name, name);
-    dp->next = dirs;
-    dirs = dp;
-  } else if (S_ISREG (st.st_mode)) {
-    int fd, i;
-    f * fp, * fp2;
-    h * hp;
-    char *p, *q;
-    char *n1, *n2;
-    int cksumsize = sizeof(buf);
-    unsigned int cksum;
-    time_t mtime = content_only ? 0 : st.st_mtime;
-    unsigned int hsh = hash (st.st_size, mtime);
-    nregfiles++;
-    if (verbose > 1)
-      fprintf(stderr, "  %s", name);
-    fd = open (name, O_RDONLY);
-    if (fd < 0) return;
-    if (st.st_size < sizeof(buf)) {
-      cksumsize = st.st_size;
-      memset (((char *)buf) + cksumsize, 0, (sizeof(buf) - cksumsize) % sizeof(buf[0]));
-    }
-    if (read (fd, buf, cksumsize) != cksumsize) {
-      close(fd);
-      if (verbose > 1)
-        fprintf(stderr, "\r%*s\r", (int)strlen(name)+2, "");
-      return;
-    }
-    cksumsize = (cksumsize + sizeof(buf[0]) - 1) / sizeof(buf[0]);
-    for (i = 0, cksum = 0; i < cksumsize; i++) {
-      if (cksum + buf[i] < cksum)
-        cksum += buf[i] + 1;
-      else
-        cksum += buf[i];
-    }
-    for (hp = hps[hsh]; hp; hp = hp->next)
-      if (hp->size == st.st_size && hp->mtime == mtime)
-        break;
-    if (!hp) {
-      hp = malloc(sizeof(h));
-      if (!hp) {
-        fprintf(stderr, "\nOut of memory 1\n");
-        doexit(1);
-      }
-      hp->size = st.st_size;
-      hp->mtime = mtime;
-      hp->chain = NULL;
-      hp->next = hps[hsh];
-      hps[hsh] = hp;
-    }
-    for (fp = hp->chain; fp; fp = fp->next)
-      if (fp->cksum == cksum)
-        break;
-    for (fp2 = fp; fp2 && fp2->cksum == cksum; fp2 = fp2->next)
-      if (fp2->ino == st.st_ino && fp2->dev == st.st_dev) {
-        close(fd);
-        if (verbose > 1)
-          fprintf(stderr, "\r%*s\r", (int)strlen(name)+2, "");
-        return;
-      }
-    if (fp) {
-      p = mmap (NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
-      nmmap++;
-      if (p == (void *)-1) {
-        close(fd);
-        fprintf(stderr, "\nFailed to mmap %s\n", name);
-        return;
-      }
-    }
-    for (fp2 = fp; fp2 && fp2->cksum == cksum; fp2 = fp2->next)
-      if (!lstat (fp2->name, &st2) && S_ISREG (st2.st_mode) &&
-          !stcmp (&st, &st2, content_only) &&
-          st2.st_ino != st.st_ino &&
-          st2.st_dev == st.st_dev) {
-        int fd2 = open (fp2->name, O_RDONLY);
-        if (fd2 < 0) continue;
-        if (fstat (fd2, &st2) || !S_ISREG (st2.st_mode)) {
-          close (fd2);
-          continue;
-        }
-        ncomp++;
-        q = mmap (NULL, st.st_size, PROT_READ, MAP_SHARED, fd2, 0);
-        if (q == (void *)-1) {
-          close(fd2);
-          fprintf(stderr, "\nFailed to mmap %s\n", fp2->name);
-          continue;
-        }
-        if (memcmp (p, q, st.st_size)) {
-          munmap (q, st.st_size);
-          close(fd2);
-          continue;
-        }
-        munmap (q, st.st_size);
-        close(fd2);
-        if (lstat (name, &st3)) {
-          fprintf(stderr, "\nCould not stat %s again\n", name);
-          munmap (p, st.st_size);
-          close(fd);
-          return;
-        }
-        st3.st_atime = st.st_atime;
-        if (stcmp (&st, &st3, 0)) {
-          fprintf(stderr, "\nFile %s changed underneath us\n", name);
-          munmap (p, st.st_size);
-          close(fd);
-          return;
-        }
-        n1 = fp2->name;
-        n2 = name;
-        if (!no_link) {
-          strcpy (stpcpy (nambuf2, n2), ".$$$___cleanit___$$$");
-          if (rename (n2, nambuf2)) {
-            fprintf(stderr, "\nFailed to rename %s to %s\n", n2, nambuf2);
-            continue;
-          }
-          if (link (n1, n2)) {
-            fprintf(stderr, "\nFailed to hardlink %s to %s\n", n1, n2);
-            if (rename (nambuf2, n2)) {
-              fprintf(stderr, "\nBad bad - failed to rename back %s to %s\n", nambuf2, n2);
-            }
-            munmap (p, st.st_size);
-            close(fd);
-            return;
-          }
-          unlink (nambuf2);
-        }
-        nlinks++;
-        if (st3.st_nlink > 1) {
-	  /* We actually did not save anything this time, since the link second argument
-	     had some other links as well.  */
-          if (verbose > 1)
-            fprintf(stderr, "\r%*s\r%s %s to %s\n", (int)strlen(name)+2, "", (no_link ? "Would link" : "Linked"), n1, n2);
-        } else {
-          nsaved+=st.st_size;
-          if (verbose > 1)
-            fprintf(stderr, "\r%*s\r%s %s to %s, %s %ld\n", (int)strlen(name)+2, "", (no_link ? "Would link" : "Linked"), n1, n2, (no_link ? "would save" : "saved"), st.st_size);
-	}
-        munmap (p, st.st_size);
-        close(fd);
-        return;
-      }
-    if (fp)
-      munmap (p, st.st_size);
-    fp2 = malloc(sizeof(f) + 1 + strlen (name));
-    if (!fp2) {
-      fprintf(stderr, "\nOut of memory 2\n");
-      doexit(2);
-    }
-    close(fd);
-    fp2->ino = st.st_ino;
-    fp2->dev = st.st_dev;
-    fp2->cksum = cksum;
-    strcpy(fp2->name, name);
-    if (fp) {
-      fp2->next = fp->next;
-      fp->next = fp2;
-    } else {
-      fp2->next = hp->chain;
-      hp->chain = fp2;
-    }
-    if (verbose > 1)
-      fprintf(stderr, "\r%*s\r", (int)strlen(name)+2, "");
-    return;
-  }
-}
-
-int main(int argc, char **argv)
-{
-  int ch;
-  int i;
-  char *p;
-  d * dp;
-  DIR *dh;
-  struct dirent *di;
-  while ((ch = getopt (argc, argv, "cnv")) != -1) {
-    switch (ch) {
-    case 'n':
-      no_link++;
-      break;
-    case 'v':
-      verbose++;
-      break;
-    case 'c':
-      content_only++;
-      break;
-    default:
-      usage(argv[0]);
-    }
-  }
-  if (optind >= argc)
-    usage(argv[0]);
-  for (i = optind; i < argc; i++)
-    rf(argv[i]);
-  while (dirs) {
-    dp = dirs;
-    dirs = dp->next;
-    strcpy (nambuf1, dp->name);
-    free (dp);
-    strcat (nambuf1, "/");
-    p = strchr (nambuf1, 0);
-    dh = opendir (nambuf1);
-    if (dh == NULL)
-      continue;
-    ndirs++;
-    while ((di = readdir (dh)) != NULL) {
-      if (!di->d_name[0])
-        continue;
-      if (di->d_name[0] == '.') {
-        char *q;
-        if (!di->d_name[1] || !strcmp (di->d_name, "..") || !strncmp (di->d_name, ".in.", 4))
-          continue;
-        q = strrchr (di->d_name, '.');
-        if (q && strlen (q) == 7 && q != di->d_name) {
-          *p = 0;
-          if (verbose)
-            fprintf(stderr, "Skipping %s%s\n", nambuf1, di->d_name);
-          continue;
-        }
-      }
-      strcpy (p, di->d_name);
-      rf(nambuf1);
-    }
-    closedir(dh);
-  }
-  doexit(0);
-  return 0;
-}

-----------------------------------------------------------------------

Summary of changes:
 fedora/glibc.spec.in |    4 +-
 fedora/hardlink.c    |  344 --------------------------------------------------
 2 files changed, 1 insertions(+), 347 deletions(-)
 delete mode 100644 fedora/hardlink.c


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]