changeset 1082:b895518fdc40

blkid cleanup: Convert tabs to spaces.
author Rob Landley <rob@landley.net>
date Mon, 07 Oct 2013 14:37:41 -0500
parents 7cd565f5adb5
children 8f0a577dcdd3
files toys/pending/blkid.c
diffstat 1 files changed, 79 insertions(+), 79 deletions(-) [+]
line wrap: on
line diff
--- a/toys/pending/blkid.c	Mon Oct 07 14:12:35 2013 -0500
+++ b/toys/pending/blkid.c	Mon Oct 07 14:37:41 2013 -0500
@@ -26,10 +26,10 @@
 #define C2I(a,b,c,d) (a|(b<<8)|(c<<16)|(d<<24))
 
 typedef struct fs_info{
-	unsigned uuid_off;
-	unsigned lab_off;
-	short uuid_t;
-	short lab_len;
+  unsigned uuid_off;
+  unsigned lab_off;
+  short uuid_t;
+  short lab_len;
 }fs_info_t;
 
 //#define SET_FS(t) (fs_info_t){t##_UUID,t##_LABEL,t##_UUID_T,t##_LABEL_SZ}
@@ -122,92 +122,92 @@
 
 #if (CFG_BLKID)
 char *toutf8(unsigned short * ws){	/* hack for NTFS utf16 */
-	static char buf[16];
-	int i=0;
-	while((buf[i++]=*ws++));
-	return buf;
+  static char buf[16];
+  int i=0;
+  while((buf[i++]=*ws++));
+  return buf;
 }
 #endif
 
 /* TODO if no args use proc/partitions */
 void do_blkid(int fd, char *name){	
-	fs_info_t fs;
-	char *fstype;
-	unsigned char buf[66560];  /*toybuf is only 4096, could rework logic*/
-	int sb_read;
+  fs_info_t fs;
+  char *fstype;
+  unsigned char buf[66560];  /*toybuf is only 4096, could rework logic*/
+  int sb_read;
 
-	sb_read = read(fd, &buf, sizeof(buf));
-	if (sb_read < 1) return;
+  sb_read = read(fd, &buf, sizeof(buf));
+  if (sb_read < 1) return;
 
-	if MATCH(buf,ADFS){
-		fstype="adfs";
-		if (CFG_BLKID) fs=SET_FS(ADFS);
-	}else if MATCH(buf,BFS){
-		fstype="bfs";
-		if (CFG_BLKID) fs=SET_FS(BFS);
-	}else if MATCH(buf,CRAMFS){
-		fstype="cramfs";
-		if (CFG_BLKID) fs=SET_FS(CRAMFS);
-	}else if MATCH3(buf,EXT){
-		fstype=(buf[EXT3_BYTE]&BIT(2))?((buf[EXT4_BYTE]&BIT(6))?"ext4":"ext3"):"ext2";
-		if (CFG_BLKID) fs=SET_FS(EXT);
-	}else if MATCH(buf,F2FS){
-		fstype="f2fs";
-		if (CFG_BLKID) fs=SET_FS(F2FS);
-	}else if MATCH(buf,NILFS){
-		fstype="nilfs";
-		if (CFG_BLKID) fs=SET_FS(NILFS);
-	}else if MATCH(buf,NTFS){
-		fstype="ntfs";
-		if (CFG_BLKID) fs=SET_FS(NTFS);
-	}else if MATCH(buf,XIAFS){
-		fstype="xiafs";
-		if (CFG_BLKID) fs=SET_FS(XIAFS);
+  if MATCH(buf,ADFS){
+    fstype="adfs";
+    if (CFG_BLKID) fs=SET_FS(ADFS);
+  }else if MATCH(buf,BFS){
+    fstype="bfs";
+    if (CFG_BLKID) fs=SET_FS(BFS);
+  }else if MATCH(buf,CRAMFS){
+    fstype="cramfs";
+    if (CFG_BLKID) fs=SET_FS(CRAMFS);
+  }else if MATCH3(buf,EXT){
+    fstype=(buf[EXT3_BYTE]&BIT(2))?((buf[EXT4_BYTE]&BIT(6))?"ext4":"ext3"):"ext2";
+    if (CFG_BLKID) fs=SET_FS(EXT);
+  }else if MATCH(buf,F2FS){
+    fstype="f2fs";
+    if (CFG_BLKID) fs=SET_FS(F2FS);
+  }else if MATCH(buf,NILFS){
+    fstype="nilfs";
+    if (CFG_BLKID) fs=SET_FS(NILFS);
+  }else if MATCH(buf,NTFS){
+    fstype="ntfs";
+    if (CFG_BLKID) fs=SET_FS(NTFS);
+  }else if MATCH(buf,XIAFS){
+    fstype="xiafs";
+    if (CFG_BLKID) fs=SET_FS(XIAFS);
 /*below here would require more than 1 toybuf*/
-	}else if MATCH(buf,REISER){
-		fstype="reiserfs";
-		if (CFG_BLKID) fs=SET_FS(REISER);
-	}else if MATCH(buf,JFS){
-		fstype="jfs";
-		if (CFG_BLKID) fs=SET_FS(JFS);
-	}else if MATCH(buf,BTRFS){
-		fstype="btrfs";
-		if (CFG_BLKID) fs=SET_FS(BTRFS);
-	}else if MATCH(buf,REISERB){
-		fstype="reiserfs";
-		if (CFG_BLKID) fs=SET_FS(REISERB);
-	}else return;
+  }else if MATCH(buf,REISER){
+    fstype="reiserfs";
+    if (CFG_BLKID) fs=SET_FS(REISER);
+  }else if MATCH(buf,JFS){
+    fstype="jfs";
+    if (CFG_BLKID) fs=SET_FS(JFS);
+  }else if MATCH(buf,BTRFS){
+    fstype="btrfs";
+    if (CFG_BLKID) fs=SET_FS(BTRFS);
+  }else if MATCH(buf,REISERB){
+    fstype="reiserfs";
+    if (CFG_BLKID) fs=SET_FS(REISERB);
+  }else return;
 
 if (CFG_BLKID  && !strncmp("blkid",toys.which->name,5) ){
-	printf("%s:",name);
-	if ( fs.lab_len > 0 )
-		printf(" LABEL=\"%.*s\"", fs.lab_len, (char *)&buf[fs.lab_off]);
-	else if ( fs.lab_len < 0 )
-		printf(" LABEL=\"%.*s\"", -fs.lab_len,
-			toutf8((unsigned short *)&buf[fs.lab_off]));
-	if ( fs.uuid_off > 0 ){
-		if ( fs.uuid_t == 16 )
-			printf(" UUID=\"%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-"
-			"%02x%02x%02x%02x%02x%02x\"",
-			buf[fs.uuid_off], buf[fs.uuid_off+1],
-			buf[fs.uuid_off+2], buf[fs.uuid_off+3],
-			buf[fs.uuid_off+4], buf[fs.uuid_off+5],
-			buf[fs.uuid_off+6], buf[fs.uuid_off+7],
-			buf[fs.uuid_off+8], buf[fs.uuid_off+9],
-			buf[fs.uuid_off+10], buf[fs.uuid_off+11],
-			buf[fs.uuid_off+12], buf[fs.uuid_off+13],
-			buf[fs.uuid_off+14], buf[fs.uuid_off+15]);
-		if ( fs.uuid_t == 8 )
-			printf(" UUID=\"%02X%02X%02X%02X%02X%02X%02X%02X\"",
-			buf[fs.uuid_off+7], buf[fs.uuid_off+6],
-			buf[fs.uuid_off+5], buf[fs.uuid_off+4],
-			buf[fs.uuid_off+3], buf[fs.uuid_off+2],
-			buf[fs.uuid_off+1], buf[fs.uuid_off]);
-	}
-	printf(" TYPE=\"%s\"",fstype);
+  printf("%s:",name);
+  if ( fs.lab_len > 0 )
+    printf(" LABEL=\"%.*s\"", fs.lab_len, (char *)&buf[fs.lab_off]);
+  else if ( fs.lab_len < 0 )
+    printf(" LABEL=\"%.*s\"", -fs.lab_len,
+      toutf8((unsigned short *)&buf[fs.lab_off]));
+  if ( fs.uuid_off > 0 ){
+    if ( fs.uuid_t == 16 )
+      printf(" UUID=\"%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-"
+      "%02x%02x%02x%02x%02x%02x\"",
+      buf[fs.uuid_off], buf[fs.uuid_off+1],
+      buf[fs.uuid_off+2], buf[fs.uuid_off+3],
+      buf[fs.uuid_off+4], buf[fs.uuid_off+5],
+      buf[fs.uuid_off+6], buf[fs.uuid_off+7],
+      buf[fs.uuid_off+8], buf[fs.uuid_off+9],
+      buf[fs.uuid_off+10], buf[fs.uuid_off+11],
+      buf[fs.uuid_off+12], buf[fs.uuid_off+13],
+      buf[fs.uuid_off+14], buf[fs.uuid_off+15]);
+    if ( fs.uuid_t == 8 )
+      printf(" UUID=\"%02X%02X%02X%02X%02X%02X%02X%02X\"",
+      buf[fs.uuid_off+7], buf[fs.uuid_off+6],
+      buf[fs.uuid_off+5], buf[fs.uuid_off+4],
+      buf[fs.uuid_off+3], buf[fs.uuid_off+2],
+      buf[fs.uuid_off+1], buf[fs.uuid_off]);
+  }
+  printf(" TYPE=\"%s\"",fstype);
 }else /* fstype */
-	write(1,fstype,strlen(fstype));	/* avoid printf overhead in fstype */
-	putchar('\n');
+  write(1,fstype,strlen(fstype));	/* avoid printf overhead in fstype */
+  putchar('\n');
 }
 
 #if (CFG_BLKID)