Mercurial > hg > xemacs-beta

changeset 495:02f7a782086f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2001-05-01 09:36:44 by ben] * config.inc.samp (MAKEINFO): point at more standard c: not f:. Fix more compiler warnings, clean up the style to conform more to standard XEmacs.
author ben
date Tue, 01 May 2001 09:36:44 +0000
parents 4137b1fb7b90
children 98145293255c
files nt/ChangeLog nt/config.inc.samp nt/minitar.c
diffstat 3 files changed, 158 insertions(+), 141 deletions(-) [+]
line wrap: on
line diff
--- a/nt/ChangeLog	Tue May 01 07:23:47 2001 +0000
+++ b/nt/ChangeLog	Tue May 01 09:36:44 2001 +0000
@@ -1,3 +1,14 @@
+2001-05-01  Ben Wing  <ben@xemacs.org>
+
+	* config.inc.samp (MAKEINFO): point at more standard c: not f:.
+	* minitar.c:
+	* minitar.c (Usage):
+	* minitar.c (octal):
+	* minitar.c (makepath):
+	* minitar.c (main):
+	Fix more compiler warnings, clean up the style to conform
+	more to standard XEmacs.
+
 2001-05-01  Ben Wing  <ben@xemacs.org>
 
 	* xemacs.mak (DEPEND):
@@ -7,16 +18,6 @@
 	Don't use $(DEL) in the middle of a shell command, because it
 	will try to call `-del' and fail.
 
-2001-04-23  Ben Wing  <ben@xemacs.org>
-
-	* minitar.c:
-	* minitar.c (Usage):
-	* minitar.c (octal):
-	* minitar.c (makepath):
-	* minitar.c (main):
-	Fix more compiler warnings, clean up the style to conform
-	more to standard XEmacs.
-
 2001-04-27  Adrian Aichner  <adrian@xemacs.org>
 
 	* compface.mak (clean): New target.
--- a/nt/config.inc.samp	Tue May 01 07:23:47 2001 +0000
+++ b/nt/config.inc.samp	Tue May 01 09:36:44 2001 +0000
@@ -58,7 +58,7 @@
 
 # Set this to specify the location of makeinfo. (If not set, XEmacs will
 # attempt to use its built-in texinfo support when building info files.)
-MAKEINFO=f:\src\texinfo-4.0\makeinfo\makeinfo.exe
+MAKEINFO=c:\src\texinfo-4.0\makeinfo\makeinfo.exe
 
 ############################################################################
 
--- a/nt/minitar.c	Tue May 01 07:23:47 2001 +0000
+++ b/nt/minitar.c	Tue May 01 09:36:44 2001 +0000
@@ -20,11 +20,12 @@
 #include <zlib.h>
 
 static int
-Usage(char *name)
+Usage (char *name)
 {
-  fprintf(stderr,"Usage: %s file.tar.gz [base-dir]\n",name);
-  fprintf(stderr,"\tExtracts the contents compressed tar file to base-dir\n");
-  exit(-1);
+  fprintf (stderr, "Usage: %s file.tar.gz [base-dir]\n", name);
+  fprintf (stderr, "\tExtracts the contents compressed tar file to base-dir\n");
+  exit (-1);
+  return 0;
 }
 
 
@@ -32,10 +33,10 @@
 #define MAXNAMELEN 1024
 
 static int
-octal(char *str)
+octal (char *str)
 {
   int ret = -1;
-  sscanf(str,"%o",&ret);
+  sscanf (str, "%o", &ret);
   return ret;
 }
 
@@ -44,39 +45,40 @@
    path component, so it is not created as a directory */
 
 static int
-makepath(char *path)
+makepath (char *path)
 {
   char tmp[MAXNAMELEN];
   char *cp;
 
-  for (cp=path; cp; cp = (char*)strchr(cp+1,'/')){
-    if (!*cp)
-      break;
-    if (*cp != '/')
-      continue;
-    strncpy(tmp, path, cp-path);
-    tmp[cp-path] = '\0';
-    if (strlen(tmp) == 0)
-      continue;
+  for (cp=path; cp; cp = (char*)strchr (cp+1, '/'))
+    {
+      if (!*cp)
+	break;
+      if (*cp != '/')
+	continue;
+      strncpy (tmp, path, cp-path);
+      tmp[cp-path] = '\0';
+      if (strlen (tmp) == 0)
+	continue;
 #ifdef WIN32_NATIVE
-    if (mkdir(tmp)){
+      if (mkdir (tmp))
 #else
-    if (mkdir(tmp,0777)){
+	if (mkdir (tmp, 0777))
 #endif
-      if (errno == EEXIST)
-	continue;
-      else
-	return -1;
+	  {
+	    if (errno == EEXIST)
+	      continue;
+	    else
+	      return -1;
+	  }
     }
-  }
   return 0;
 }
 
-  
-		     
+
 
 int
-main(int argc, char **argv)
+main (int argc, char **argv)
 {
   char fullname[MAXNAMELEN];
   char *basedir = ".";
@@ -97,124 +99,138 @@
   int directory = 0;
 
   if (argc < 2 || argc > 3)
-    Usage(argv[0]);
+    Usage (argv[0]);
 
   tarfile = argv[1];
   if (argc==3)
     basedir = argv[2];
 
-  if (! (infile = gzopen(tarfile,"rb"))){
-    fprintf(stderr,"Cannot open %s\n", tarfile);
-    exit(-2);
-  }
+  if (! (infile = gzopen (tarfile, "rb")))
+    {
+      fprintf (stderr, "Cannot open %s\n", tarfile);
+      exit (-2);
+    }
   
-  while (1){
-  
-
-    nread = gzread(infile,block,512);
+  while (1)
+    {
+      nread = gzread (infile, block, 512);
 
-    if (!in_block && nread == 0)
-      break;
-
-    if (nread != BLOCKSIZE){
-      fprintf(stderr,"Error: incomplete block read. Exiting.\n");
-      exit(-2);
-    }
-
-    if (!in_block){
-      if (block[0]=='\0')  /* We're done */
+      if (!in_block && nread == 0)
 	break;
 
-      strncpy(magic,block+257,6);
-      magic[6] = '\0';
-      if (strcmp(magic,"ustar ")){
-	fprintf(stderr,
-		"Error: incorrect magic number in tar header. Exiting\n");
-      }
-
-      strncpy(name,block,100);
-      name[100] = '\0';
-      sprintf(fullname,"%s/%s",basedir,name);
-      printf("%s\n",fullname);
-      type = block[156];
-      
-      switch(type){
-      case '0':
-      case '\0':
-	directory = 0;
-	break;
-      case '5':
-	directory = 1;
-	break;
-      default:
-	fprintf(stderr,"Error: unknown type flag %c. Exiting.\n",type);
-	break;
-      }
-      
-      if (directory){
-	in_block = 0;
-	
-	/* makepath will ignore the final path component, so make sure 
-	   dirnames have a trailing slash */
-
-	if (fullname[strlen(fullname)-1] != '/')
-	  strcat(fullname,"/");
-	if (makepath(fullname)){
-	  fprintf(stderr, "Error: cannot create directory %s. Exiting.\n",
-		  fullname);
-	  exit(-2);
-	}
-	continue;
-      } else { /*file */
-	in_block = 1;
-	if (outfile){
-	  if (fclose(outfile)){
-	    fprintf(stderr,"Error: cannot close file %s. Exiting.\n",
-		    fullname);
-	    exit(-2);
-	  }
-	  outfile = (FILE*)0;
+      if (nread != BLOCKSIZE)
+	{
+	  fprintf (stderr, "Error: incomplete block read. Exiting.\n");
+	  exit (-2);
 	}
 
-	if ( !(outfile = fopen(fullname,"wb"))){
-	  /*try creating the directory, maybe it's not there */
-	  if (makepath(fullname)){
-	    fprintf(stderr,"Error: cannot create file %s. Exiting.\n",
-		    fullname);
-	    exit(-2);
-	  }
-	  /* now try again to open the file */
-	  if (!(outfile = fopen(fullname,"wb"))){
-	    fprintf(stderr,"Error: cannot create file %s. Exiting.\n",
-		    fullname);
-	    exit(-2);
-	  }
-	}
+      if (!in_block)
+	{
+	  if (block[0]=='\0')  /* We're done */
+	    break;
+
+	  strncpy (magic, block+257, 6);
+	  magic[6] = '\0';
+	  if (strcmp (magic, "ustar "))
+	    {
+	      fprintf (stderr,
+		       "Error: incorrect magic number in tar header. Exiting\n");
+	    }
+
+	  strncpy (name, block, 100);
+	  name[100] = '\0';
+	  sprintf (fullname, "%s/%s", basedir, name);
+	  printf ("%s\n", fullname);
+	  type = block[156];
+      
+	  switch (type)
+	    {
+	    case '0':
+	    case '\0':
+	      directory = 0;
+	      break;
+	    case '5':
+	      directory = 1;
+	      break;
+	    default:
+	      fprintf (stderr, "Error: unknown type flag %c. Exiting.\n", type);
+	      break;
+	    }
+      
+	  if (directory)
+	    {
+	      in_block = 0;
+	
+	      /* makepath will ignore the final path component, so make sure 
+		 dirnames have a trailing slash */
 
-	strncpy(osize,block+124,12);
-	osize[12] = '\0';
-	size = octal(osize);
-	if (size<0){
-	  fprintf(stderr,"Error: invalid size in tar header. Exiting.\n");
-	  exit(-2);
-	}
-      }
-    } else { /* write or continue writing file contents */
-      nbytes = size>512? 512:size;
+	      if (fullname[strlen (fullname)-1] != '/')
+		strcat (fullname, "/");
+	      if (makepath (fullname))
+		{
+		  fprintf (stderr, "Error: cannot create directory %s. Exiting.\n",
+			   fullname);
+		  exit (-2);
+		}
+	      continue;
+	    }
+	  else
+	    { /*file */
+	      in_block = 1;
+	      if (outfile)
+		{
+		  if (fclose (outfile))
+		    {
+		      fprintf (stderr, "Error: cannot close file %s. Exiting.\n",
+			       fullname);
+		      exit (-2);
+		    }
+		  outfile = (FILE*)0;
+		}
+
+	      if (!(outfile = fopen (fullname, "wb")))
+		{
+		  /*try creating the directory, maybe it's not there */
+		  if (makepath (fullname))
+		    {
+		      fprintf (stderr, "Error: cannot create file %s. Exiting.\n",
+			       fullname);
+		      exit (-2);
+		    }
+		  /* now try again to open the file */
+		  if (!(outfile = fopen (fullname, "wb")))
+		    {
+		      fprintf (stderr, "Error: cannot create file %s. Exiting.\n",
+			       fullname);
+		      exit (-2);
+		    }
+		}
+
+	      strncpy (osize, block+124, 12);
+	      osize[12] = '\0';
+	      size = octal (osize);
+	      if (size<0)
+		{
+		  fprintf (stderr, "Error: invalid size in tar header. Exiting.\n");
+		  exit (-2);
+		}
+	    }
+	} else { /* write or continue writing file contents */
+	  nbytes = size>512? 512:size;
       
-      nwritten = fwrite(block, 1, nbytes, outfile);
-      if (nwritten != nbytes){
-	fprintf(stderr, "Error: only wrote %d bytes to file %s. Exiting.\n",
-		nwritten, fullname);
-      }
-      size -= nbytes;
-      if (size==0)
-	in_block = 0;
+	  nwritten = fwrite (block, 1, nbytes, outfile);
+	  if (nwritten != nbytes)
+	    {
+	      fprintf (stderr, "Error: only wrote %d bytes to file %s. Exiting.\n",
+		       nwritten, fullname);
+	    }
+	  size -= nbytes;
+	  if (size==0)
+	    in_block = 0;
+	}
     }
-  }
-  exit (0);
-}	
-
+  return 0;
+}